rdelaage/postgresql
1
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-09-28 00:21:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

dblink: Change some StringInfo to StringInfoData

Browse Source 
For consistency with other code and to avoid wasting some small amount
of memory.

From: Tsunakawa, Takayuki <tsunakawa.takay@jp.fujitsu.com>
This commit is contained in:
Peter Eisentraut 2017-03-10 09:59:10 -05:00
parent acaf7ccb94
commit 22ef6b041a
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
contrib/dblink/dblink.c
View File

@ -2721,13 +2721,15 @@ get_connect_string(const char *servername)
ForeignServer *foreign_server = NULL; ForeignServer *foreign_server = NULL;
UserMapping *user_mapping; UserMapping *user_mapping;
ListCell *cell; ListCell *cell;
StringInfo buf = makeStringInfo(); StringInfoData buf;
ForeignDataWrapper *fdw; ForeignDataWrapper *fdw;
AclResult aclresult; AclResult aclresult;
char *srvname; char *srvname;
static const PQconninfoOption *options = NULL; static const PQconninfoOption *options = NULL;
initStringInfo(&buf);
/* /*
* Get list of valid libpq options. * Get list of valid libpq options.
* *
@ -2769,7 +2771,7 @@ get_connect_string(const char *servername)
DefElem *def = lfirst(cell); DefElem *def = lfirst(cell);
if (is_valid_dblink_option(options, def->defname, ForeignDataWrapperRelationId)) if (is_valid_dblink_option(options, def->defname, ForeignDataWrapperRelationId))
appendStringInfo(buf, "%s='%s' ", def->defname, appendStringInfo(&buf, "%s='%s' ", def->defname,
escape_param_str(strVal(def->arg))); escape_param_str(strVal(def->arg)));
} }
@ -2778,7 +2780,7 @@ get_connect_string(const char *servername)
DefElem *def = lfirst(cell); DefElem *def = lfirst(cell);
if (is_valid_dblink_option(options, def->defname, ForeignServerRelationId)) if (is_valid_dblink_option(options, def->defname, ForeignServerRelationId))
appendStringInfo(buf, "%s='%s' ", def->defname, appendStringInfo(&buf, "%s='%s' ", def->defname,
escape_param_str(strVal(def->arg))); escape_param_str(strVal(def->arg)));
} }
@ -2788,11 +2790,11 @@ get_connect_string(const char *servername)
DefElem *def = lfirst(cell); DefElem *def = lfirst(cell);
if (is_valid_dblink_option(options, def->defname, UserMappingRelationId)) if (is_valid_dblink_option(options, def->defname, UserMappingRelationId))
appendStringInfo(buf, "%s='%s' ", def->defname, appendStringInfo(&buf, "%s='%s' ", def->defname,
escape_param_str(strVal(def->arg))); escape_param_str(strVal(def->arg)));
} }
return buf->data; return buf.data;
} }
else else
return NULL; return NULL;
@ -2807,16 +2809,18 @@ static char *
escape_param_str(const char *str) escape_param_str(const char *str)
{ {
const char *cp; const char *cp;
StringInfo buf = makeStringInfo(); StringInfoData buf;
initStringInfo(&buf);
for (cp = str; *cp; cp++) for (cp = str; *cp; cp++)
{ {
if (*cp == '\\' || *cp == '\'') if (*cp == '\\' || *cp == '\'')
appendStringInfoChar(buf, '\\'); appendStringInfoChar(&buf, '\\');
appendStringInfoChar(buf, *cp); appendStringInfoChar(&buf, *cp);
} }
return buf->data; return buf.data;
} }
/* /*