database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-29 10:41:53 +03:00
Code Activity

Remove useless database name from bootstrap argument processing (including

Browse Source 
startup and bgwriter processes), and the -y flag.  It's not used anywhere.
This commit is contained in:
Alvaro Herrera
2007-02-16 02:10:07 +00:00
parent 6bef118b01
commit 68046a20c7
4 changed files with 10 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/backend/bootstrap/bootstrap.c
View File

@ -8,7 +8,7 @@
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/bootstrap/bootstrap.c,v 1.231 2007/02/15 23:23:22 alvherre Exp $
* $PostgreSQL: pgsql/src/backend/bootstrap/bootstrap.c,v 1.232 2007/02/16 02:10:07 alvherre Exp $
*
*-------------------------------------------------------------------------
*/
@ -208,7 +208,6 @@ BootstrapMain(int argc, char *argv[])
{
char *progname = argv[0];
int i;
char *dbname;
int flag;
int xlogop = BS_XLOG_NOP;
char *userDoption = NULL;
@ -239,7 +238,6 @@ BootstrapMain(int argc, char *argv[])
*/
/* Set defaults, to be overriden by explicit options below */
dbname = NULL;
if (!IsUnderPostmaster)
InitializeGUCOptions();
@ -250,7 +248,7 @@ BootstrapMain(int argc, char *argv[])
argc--;
}
while ((flag = getopt(argc, argv, "B:c:d:D:Fr:x:y:-:")) != -1)
while ((flag = getopt(argc, argv, "B:c:d:D:Fr:x:-:")) != -1)
{
switch (flag)
{
@ -282,9 +280,6 @@ BootstrapMain(int argc, char *argv[])
case 'x':
xlogop = atoi(optarg);
break;
case 'y':
dbname = strdup(optarg);
break;
case 'c':
case '-':
{
@ -320,12 +315,7 @@ BootstrapMain(int argc, char *argv[])
}
}
if (!dbname && argc - optind == 1)
{
dbname = argv[optind];
optind++;
}
if (!dbname || argc != optind)
if (argc != optind)
{
write_stderr("%s: invalid command-line arguments\n", progname);
proc_exit(1);
@ -449,7 +439,7 @@ BootstrapMain(int argc, char *argv[])
* Do backend-like initialization for bootstrap mode
*/
InitProcess();
(void) InitPostgres(dbname, InvalidOid, NULL, NULL);
(void) InitPostgres(NULL, InvalidOid, NULL, NULL);
/*
* In NOP mode, all we really want to do is create shared memory and