@@ -49,8 +49,8 @@ static void makeAlterConfigCommand(PGconn *conn, const char *arrayitem,
4949const char * name2 );
5050static void dumpDatabases (PGconn * conn );
5151static void dumpTimestamp (const char * msg );
52- static void doShellQuoting (PQExpBuffer buf ,const char * str );
53- static void doConnStrQuoting (PQExpBuffer buf ,const char * str );
52+ static void appendShellString (PQExpBuffer buf ,const char * str );
53+ static void appendConnStrVal (PQExpBuffer buf ,const char * str );
5454
5555static int runPgDump (const char * dbname );
5656static void buildShSecLabels (PGconn * conn ,const char * catalog_name ,
@@ -214,7 +214,7 @@ main(int argc, char *argv[])
214214case 'f' :
215215filename = pg_strdup (optarg );
216216appendPQExpBufferStr (pgdumpopts ," -f " );
217- doShellQuoting (pgdumpopts ,filename );
217+ appendShellString (pgdumpopts ,filename );
218218break ;
219219
220220case 'g' :
@@ -251,7 +251,7 @@ main(int argc, char *argv[])
251251
252252case 'S' :
253253appendPQExpBufferStr (pgdumpopts ," -S " );
254- doShellQuoting (pgdumpopts ,optarg );
254+ appendShellString (pgdumpopts ,optarg );
255255break ;
256256
257257case 't' :
@@ -287,13 +287,13 @@ main(int argc, char *argv[])
287287
288288case 2 :
289289appendPQExpBufferStr (pgdumpopts ," --lock-wait-timeout " );
290- doShellQuoting (pgdumpopts ,optarg );
290+ appendShellString (pgdumpopts ,optarg );
291291break ;
292292
293293case 3 :
294294use_role = pg_strdup (optarg );
295295appendPQExpBufferStr (pgdumpopts ," --role " );
296- doShellQuoting (pgdumpopts ,use_role );
296+ appendShellString (pgdumpopts ,use_role );
297297break ;
298298
299299default :
@@ -1726,9 +1726,9 @@ runPgDump(const char *dbname)
17261726 * string.
17271727 */
17281728appendPQExpBuffer (connstrbuf ,"%s dbname=" ,connstr );
1729- doConnStrQuoting (connstrbuf ,dbname );
1729+ appendConnStrVal (connstrbuf ,dbname );
17301730
1731- doShellQuoting (cmd ,connstrbuf -> data );
1731+ appendShellString (cmd ,connstrbuf -> data );
17321732
17331733if (verbose )
17341734fprintf (stderr ,_ ("%s: running \"%s\"\n" ),progname ,cmd -> data );
@@ -2008,7 +2008,7 @@ constructConnStr(const char **keywords, const char **values)
20082008appendPQExpBufferChar (buf ,' ' );
20092009firstkeyword = false;
20102010appendPQExpBuffer (buf ,"%s=" ,keywords [i ]);
2011- doConnStrQuoting (buf ,values [i ]);
2011+ appendConnStrVal (buf ,values [i ]);
20122012}
20132013
20142014connstr = pg_strdup (buf -> data );
@@ -2089,7 +2089,7 @@ dumpTimestamp(const char *msg)
20892089 * string
20902090 */
20912091static void
2092- doConnStrQuoting (PQExpBuffer buf ,const char * str )
2092+ appendConnStrVal (PQExpBuffer buf ,const char * str )
20932093{
20942094const char * s ;
20952095bool needquotes ;
@@ -2138,7 +2138,7 @@ doConnStrQuoting(PQExpBuffer buf, const char *str)
21382138 * there eventually leads to errors here.
21392139 */
21402140static void
2141- doShellQuoting (PQExpBuffer buf ,const char * str )
2141+ appendShellString (PQExpBuffer buf ,const char * str )
21422142{
21432143const char * p ;
21442144