db/pg_probackup
db/pg_probackup
1
0
Fork 0
mirror of https://github.com/postgrespro/pg_probackup.git synced 2024-11-24 08:52:38 +02:00
Code Issues Releases Activity

Code cleanup: remove PGUT_NO_PROMPT macro

Browse Source
This commit is contained in:
Anastasia 2017-04-12 15:41:14 +03:00
parent 5372a1e544
commit e2eed71657
2 changed files with 6 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
pgut/pgut.c
View File

@ -36,9 +36,7 @@ char *password = NULL;
bool verbose = false;
bool quiet = false;
#ifndef PGUT_NO_PROMPT
YesNo prompt_password = DEFAULT;
#endif
bool prompt_password = false;
/* Database connections */
static PGcancel *volatile cancel_conn = NULL;
@ -76,10 +74,8 @@ static pgut_option default_options[] =
{ 'b', 'q', "quiet" , &quiet, SOURCE_CMDLINE },
{ 's', 'U', "username" , &username, SOURCE_CMDLINE },
{ 'b', 'v', "verbose" , &verbose, SOURCE_CMDLINE },
#ifndef PGUT_NO_PROMPT
{ 'Y', 'w', "no-password" , &prompt_password, SOURCE_CMDLINE },
{ 'y', 'W', "password" , &prompt_password, SOURCE_CMDLINE },
#endif
{ 'B', 'w', "no-password" , &prompt_password, SOURCE_CMDLINE },
{ 'b', 'W', "password" , &prompt_password, SOURCE_CMDLINE },
{ 0 }
};
@ -98,8 +94,6 @@ option_has_arg(char type)
{
case 'b':
case 'B':
case 'y':
case 'Y':
return no_argument;
default:
return required_argument;
@ -225,24 +219,6 @@ assign_option(pgut_option *opt, const char *optarg, pgut_optsrc src)
return;
message = "a time";
break;
case 'y':
case 'Y':
if (optarg == NULL)
{
*(YesNo *) opt->var = (opt->type == 'y' ? YES : NO);
return;
}
else
{
bool value;
if (parse_bool(optarg, &value))
{
*(YesNo *) opt->var = (value ? YES : NO);
return;
}
}
message = "a boolean";
break;
default:
elog(ERROR, "invalid option type: %c", opt->type);
return; /* keep compiler quiet */
@ -867,7 +843,6 @@ parse_pair(const char buffer[], char key[], char value[])
return true;
}
#ifndef PGUT_NO_PROMPT
/*
* Ask the user for a password; 'username' is the username the
* password is for, if one has been explicitly specified.
@ -902,7 +877,6 @@ prompt_for_password(const char *username)
}
#endif
}
#endif
PGconn *
pgut_connect(const char *dbname)
@ -912,10 +886,8 @@ pgut_connect(const char *dbname)
if (interrupted && !in_cleanup)
elog(ERROR, "interrupted");
#ifndef PGUT_NO_PROMPT
if (prompt_password == YES)
if (prompt_password)
prompt_for_password(username);
#endif
/* Start the connection. Loop until we have a password if requested by backend. */
for (;;)
@ -925,14 +897,12 @@ pgut_connect(const char *dbname)
if (PQstatus(conn) == CONNECTION_OK)
return conn;
#ifndef PGUT_NO_PROMPT
if (conn && PQconnectionNeedsPassword(conn) && prompt_password != NO)
if (conn && PQconnectionNeedsPassword(conn) && prompt_password)
{
PQfinish(conn);
prompt_for_password(username);
continue;
}
#endif
elog(ERROR, "could not connect to database %s: %s",
dbname, PQerrorMessage(conn));
@ -1384,10 +1354,8 @@ help(bool details)
printf(" -h, --host=HOSTNAME database server host or socket directory\n");
printf(" -p, --port=PORT database server port\n");
printf(" -U, --username=USERNAME user name to connect as\n");
#ifndef PGUT_NO_PROMPT
printf(" -w, --no-password never prompt for password\n");
printf(" -W, --password force password prompt\n");
#endif
}
printf("\nGeneric options:\n");

13
pgut/pgut.h
View File

@ -30,13 +30,6 @@ typedef char bool;
#define INFINITE_STR "INFINITE"
typedef enum YesNo
{
DEFAULT,
NO,
YES
} YesNo;
typedef enum pgut_optsrc
{
SOURCE_DEFAULT,
@ -58,8 +51,6 @@ typedef enum pgut_optsrc
* U: 64bit unsigned integer
* s: string
* t: time_t
* y: YesNo (YES)
* Y: YesNo (NO)
*/
typedef struct pgut_option
{
@ -95,9 +86,7 @@ extern char *password;
extern bool verbose;
extern bool quiet;
#ifndef PGUT_NO_PROMPT
extern YesNo prompt_password;
#endif
extern bool prompt_password;
extern bool interrupted;