database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-02 09:02:37 +03:00
Code Activity

Replace pg_asprintf() with psprintf().

Browse Source 
This eliminates an awkward coding pattern that's also unnecessarily
inconsistent with backend coding.  psprintf() is now the thing to
use everywhere.
This commit is contained in:
Tom Lane
2013-10-22 19:40:26 -04:00
parent 09a89cb5fc
commit 2c66f9924c
19 changed files with 57 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/bin/psql/command.c
View File

@ -1188,7 +1188,7 @@ exec_command(const char *cmd,
/* Set variable to the value of the next argument */
char *newval;
pg_asprintf(&newval, "%s=%s", envvar, envval);
newval = psprintf("%s=%s", envvar, envval);
putenv(newval);
success = true;
@ -1549,7 +1549,7 @@ prompt_for_password(const char *username)
{
char *prompt_text;
pg_asprintf(&prompt_text, _("Password for user %s: "), username);
prompt_text = psprintf(_("Password for user %s: "), username);
result = simple_prompt(prompt_text, 100, false);
free(prompt_text);
}
@ -1929,17 +1929,17 @@ editFile(const char *fname, int lineno)
*/
#ifndef WIN32
if (lineno > 0)
pg_asprintf(&sys, "exec %s %s%d '%s'",
sys = psprintf("exec %s %s%d '%s'",
editorName, editor_lineno_arg, lineno, fname);
else
pg_asprintf(&sys, "exec %s '%s'",
sys = psprintf("exec %s '%s'",
editorName, fname);
#else
if (lineno > 0)
pg_asprintf(&sys, SYSTEMQUOTE "\"%s\" %s%d \"%s\"" SYSTEMQUOTE,
sys = psprintf(SYSTEMQUOTE "\"%s\" %s%d \"%s\"" SYSTEMQUOTE,
editorName, editor_lineno_arg, lineno, fname);
else
pg_asprintf(&sys, SYSTEMQUOTE "\"%s\" \"%s\"" SYSTEMQUOTE,
sys = psprintf(SYSTEMQUOTE "\"%s\" \"%s\"" SYSTEMQUOTE,
editorName, fname);
#endif
result = system(sys);
@ -2635,9 +2635,9 @@ do_shell(const char *command)
/* See EDITOR handling comment for an explanation */
#ifndef WIN32
pg_asprintf(&sys, "exec %s", shellName);
sys = psprintf("exec %s", shellName);
#else
pg_asprintf(&sys, SYSTEMQUOTE "\"%s\"" SYSTEMQUOTE, shellName);
sys = psprintf(SYSTEMQUOTE "\"%s\"" SYSTEMQUOTE, shellName);
#endif
result = system(sys);
free(sys);