diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2013-10-13 00:09:18 -0400 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2013-10-13 00:09:18 -0400 |
| commit | 5b6d08cd2992922b667564a49f19580f11676050 (patch) | |
| tree | 4104a4255eeb88e78da71477b5f7b129f9a1b599 /src/bin/psql/common.c | |
| parent | a53dee43fe585e673658b01e7354892dcede957e (diff) | |
Add use of asprintf()
Add asprintf(), pg_asprintf(), and psprintf() to simplify string
allocation and composition. Replacement implementations taken from
NetBSD.
Reviewed-by: Álvaro Herrera <alvherre@2ndquadrant.com>
Reviewed-by: Asif Naeem <anaeem.it@gmail.com>
Diffstat (limited to 'src/bin/psql/common.c')
| -rw-r--r-- | src/bin/psql/common.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c index 3dea92c7d8f..71f0c8a95a8 100644 --- a/src/bin/psql/common.c +++ b/src/bin/psql/common.c @@ -594,9 +594,7 @@ StoreQueryTuple(const PGresult *result) char *value; /* concate prefix and column name */ - varname = pg_malloc(strlen(pset.gset_prefix) + strlen(colname) + 1); - strcpy(varname, pset.gset_prefix); - strcat(varname, colname); + pg_asprintf(&varname, "%s%s", pset.gset_prefix, colname); if (!PQgetisnull(result, 0, i)) value = PQgetvalue(result, 0, i); @@ -1687,10 +1685,7 @@ expand_tilde(char **filename) { char *newfn; - newfn = pg_malloc(strlen(home) + strlen(p) + 1); - strcpy(newfn, home); - strcat(newfn, p); - + pg_asprintf(&newfn, "%s%s", home, p); free(fn); *filename = newfn; } |