Rename internal variables DBName|dbName to dbname, for consistency.

bmomjian · bmomjian · commit 3ad406bbc970 · 2003-05-06T05:15:45.000Z
diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.153 2003/05/06 04:16:35 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.154 2003/05/06 05:15:45 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -220,7 +220,7 @@ BootstrapMain(int argc, char *argv[])
  */
 {
 	int			i;
-	char	   *dbName;
+	char	   *dbname;
 	int			flag;
 	int			xlogop = BS_XLOG_NOP;
 	char	   *potential_DataDir = NULL;
@@ -244,7 +244,7 @@ BootstrapMain(int argc, char *argv[])
 	 */
 
 	/* Set defaults, to be overriden by explicit options below */
-	dbName = NULL;
+	dbname = NULL;
 	if (!IsUnderPostmaster /* when exec || ExecBackend*/)
 	{
 		InitializeGUCOptions();
@@ -297,9 +297,9 @@ BootstrapMain(int argc, char *argv[])
 	if (argc - optind != 1)
 		usage();
 
-	dbName = argv[optind];
+	dbname = argv[optind];
 
-	Assert(dbName);
+	Assert(dbname);
 
 	if (IsUnderPostmaster && ExecBackend && MyProc /* ordinary backend */)
 	{
@@ -426,7 +426,7 @@ BootstrapMain(int argc, char *argv[])
 	/*
 	 * backend initialization
 	 */
-	InitPostgres(dbName, NULL);
+	InitPostgres(dbname, NULL);
 
 	for (i = 0; i < MAXATTR; i++)
 	{
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.334 2003/05/06 04:16:35 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.335 2003/05/06 05:15:45 momjian Exp $
  *
  * NOTES
  *	  this is the "main" module of the postgres backend and
@@ -1748,7 +1748,7 @@ int
 PostgresMain(int argc, char *argv[], const char *username)
 {
 	int			flag;
-	const char *DBName = NULL;
+	const char *dbname = NULL;
 	char	   *potential_DataDir = NULL;
 	bool		secure;
 	int			errs = 0;
@@ -1987,7 +1987,7 @@ PostgresMain(int argc, char *argv[], const char *username)
 				 */
 				if (secure)
 				{
-					DBName = strdup(optarg);
+					dbname = strdup(optarg);
 					secure = false;		/* subsequent switches are NOT
 										 * secure */
 					ctx = PGC_BACKEND;
@@ -2238,7 +2238,7 @@ PostgresMain(int argc, char *argv[], const char *username)
 	if (IsUnderPostmaster)
 	{
 		/* noninteractive case: nothing should be left after switches */
-		if (errs || argc != optind || DBName == NULL)
+		if (errs || argc != optind || dbname == NULL)
 		{
 			elog(WARNING, "%s: invalid command line arguments\nTry -? for help.",
 				 argv[0]);
@@ -2260,8 +2260,8 @@ PostgresMain(int argc, char *argv[], const char *username)
 			proc_exit(1);
 		}
 		else if (argc - optind == 1)
-			DBName = argv[optind];
-		else if ((DBName = username) == NULL)
+			dbname = argv[optind];
+		else if ((dbname = username) == NULL)
 		{
 			elog(WARNING, "%s: user name undefined and no database specified",
 				 argv[0]);
@@ -2322,7 +2322,7 @@ PostgresMain(int argc, char *argv[], const char *username)
 	 * that involves database access should be there, not here.
 	 */
 	elog(DEBUG2, "InitPostgres");
-	InitPostgres(DBName, username);
+	InitPostgres(dbname, username);
 
 	SetProcessingMode(NormalProcessing);
 
@@ -2344,7 +2344,7 @@ PostgresMain(int argc, char *argv[], const char *username)
 	if (!IsUnderPostmaster)
 	{
 		puts("\nPOSTGRES backend interactive interface ");
-		puts("$Revision: 1.334 $ $Date: 2003/05/06 04:16:35 $\n");
+		puts("$Revision: 1.335 $ $Date: 2003/05/06 05:15:45 $\n");
 	}
 
 	/*

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.334 2003/05/06 04:16:35 momjian Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.335 2003/05/06 05:15:45 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`* NOTES`
`14`	`14`	`* this is the "main" module of the postgres backend and`
`@@ -1748,7 +1748,7 @@ int`
`1748`	`1748`	`PostgresMain(int argc, char argv[], const char username)`
`1749`	`1749`	`{`
`1750`	`1750`	`int flag;`
`1751`		`- const char *DBName = NULL;`
	`1751`	`+ const char *dbname = NULL;`
`1752`	`1752`	`char *potential_DataDir = NULL;`
`1753`	`1753`	`bool secure;`
`1754`	`1754`	`int errs = 0;`
`@@ -1987,7 +1987,7 @@ PostgresMain(int argc, char argv[], const char username)`
`1987`	`1987`	`*/`
`1988`	`1988`	`if (secure)`
`1989`	`1989`	`{`
`1990`		`- DBName = strdup(optarg);`
	`1990`	`+ dbname = strdup(optarg);`
`1991`	`1991`	`secure = false; /* subsequent switches are NOT`
`1992`	`1992`	`* secure */`
`1993`	`1993`	`ctx = PGC_BACKEND;`
`@@ -2238,7 +2238,7 @@ PostgresMain(int argc, char argv[], const char username)`
`2238`	`2238`	`if (IsUnderPostmaster)`
`2239`	`2239`	`{`
`2240`	`2240`	`/* noninteractive case: nothing should be left after switches */`
`2241`		`- if (errs \|\| argc != optind \|\| DBName == NULL)`
	`2241`	`+ if (errs \|\| argc != optind \|\| dbname == NULL)`
`2242`	`2242`	`{`
`2243`	`2243`	`elog(WARNING, "%s: invalid command line arguments\nTry -? for help.",`
`2244`	`2244`	`argv[0]);`
`@@ -2260,8 +2260,8 @@ PostgresMain(int argc, char argv[], const char username)`
`2260`	`2260`	`proc_exit(1);`
`2261`	`2261`	`}`
`2262`	`2262`	`else if (argc - optind == 1)`
`2263`		`- DBName = argv[optind];`
`2264`		`- else if ((DBName = username) == NULL)`
	`2263`	`+ dbname = argv[optind];`
	`2264`	`+ else if ((dbname = username) == NULL)`
`2265`	`2265`	`{`
`2266`	`2266`	`elog(WARNING, "%s: user name undefined and no database specified",`
`2267`	`2267`	`argv[0]);`
`@@ -2322,7 +2322,7 @@ PostgresMain(int argc, char argv[], const char username)`
`2322`	`2322`	`* that involves database access should be there, not here.`
`2323`	`2323`	`*/`
`2324`	`2324`	`elog(DEBUG2, "InitPostgres");`
`2325`		`- InitPostgres(DBName, username);`
	`2325`	`+ InitPostgres(dbname, username);`
`2326`	`2326`
`2327`	`2327`	`SetProcessingMode(NormalProcessing);`
`2328`	`2328`
`@@ -2344,7 +2344,7 @@ PostgresMain(int argc, char argv[], const char username)`
`2344`	`2344`	`if (!IsUnderPostmaster)`
`2345`	`2345`	`{`
`2346`	`2346`	`puts("\nPOSTGRES backend interactive interface ");`
`2347`		`- puts("$Revision: 1.334 $ $Date: 2003/05/06 04:16:35 $\n");`
	`2347`	`+ puts("$Revision: 1.335 $ $Date: 2003/05/06 05:15:45 $\n");`
`2348`	`2348`	`}`
`2349`	`2349`
`2350`	`2350`	`/*`