mirror of
https://github.com/postgres/postgres.git
synced 2025-06-30 21:42:05 +03:00
pgindent run for 8.3.
This commit is contained in:
@ -3,7 +3,7 @@
|
||||
*
|
||||
* Copyright (c) 2000-2007, PostgreSQL Global Development Group
|
||||
*
|
||||
* $PostgreSQL: pgsql/src/bin/psql/command.c,v 1.182 2007/10/13 20:18:41 tgl Exp $
|
||||
* $PostgreSQL: pgsql/src/bin/psql/command.c,v 1.183 2007/11/15 21:14:42 momjian Exp $
|
||||
*/
|
||||
#include "postgres_fe.h"
|
||||
#include "command.h"
|
||||
@ -312,9 +312,10 @@ exec_command(const char *cmd,
|
||||
|
||||
char *opt = psql_scan_slash_option(scan_state,
|
||||
OT_WHOLE_LINE, NULL, false);
|
||||
|
||||
if (pset.timing)
|
||||
GETTIMEOFDAY(&before);
|
||||
|
||||
|
||||
success = do_copy(opt);
|
||||
|
||||
if (pset.timing && success)
|
||||
@ -735,8 +736,10 @@ exec_command(const char *cmd,
|
||||
/* \prompt -- prompt and set variable */
|
||||
else if (strcmp(cmd, "prompt") == 0)
|
||||
{
|
||||
char *opt, *prompt_text = NULL;
|
||||
char *arg1, *arg2;
|
||||
char *opt,
|
||||
*prompt_text = NULL;
|
||||
char *arg1,
|
||||
*arg2;
|
||||
|
||||
arg1 = psql_scan_slash_option(scan_state, OT_NORMAL, NULL, false);
|
||||
arg2 = psql_scan_slash_option(scan_state, OT_NORMAL, NULL, false);
|
||||
@ -748,7 +751,7 @@ exec_command(const char *cmd,
|
||||
}
|
||||
else
|
||||
{
|
||||
char *result;
|
||||
char *result;
|
||||
|
||||
if (arg2)
|
||||
{
|
||||
@ -1132,9 +1135,9 @@ do_connect(char *dbname, char *user, char *host, char *port)
|
||||
* has not changed. Otherwise, try to connect without a password first,
|
||||
* and then ask for a password if needed.
|
||||
*
|
||||
* XXX: this behavior leads to spurious connection attempts recorded
|
||||
* in the postmaster's log. But libpq offers no API that would let us
|
||||
* obtain a password and then continue with the first connection attempt.
|
||||
* XXX: this behavior leads to spurious connection attempts recorded in
|
||||
* the postmaster's log. But libpq offers no API that would let us obtain
|
||||
* a password and then continue with the first connection attempt.
|
||||
*/
|
||||
if (pset.getPassword)
|
||||
{
|
||||
|
Reference in New Issue
Block a user