Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit3ad406b

Browse files
committed
Rename internal variables DBName|dbName to dbname, for consistency.
1 parent77a0219 commit3ad406b

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

‎src/backend/bootstrap/bootstrap.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.153 2003/05/0604:16:35 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.154 2003/05/0605:15:45 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -220,7 +220,7 @@ BootstrapMain(int argc, char *argv[])
220220
*/
221221
{
222222
inti;
223-
char*dbName;
223+
char*dbname;
224224
intflag;
225225
intxlogop=BS_XLOG_NOP;
226226
char*potential_DataDir=NULL;
@@ -244,7 +244,7 @@ BootstrapMain(int argc, char *argv[])
244244
*/
245245

246246
/* Set defaults, to be overriden by explicit options below */
247-
dbName=NULL;
247+
dbname=NULL;
248248
if (!IsUnderPostmaster/* when exec || ExecBackend*/)
249249
{
250250
InitializeGUCOptions();
@@ -297,9 +297,9 @@ BootstrapMain(int argc, char *argv[])
297297
if (argc-optind!=1)
298298
usage();
299299

300-
dbName=argv[optind];
300+
dbname=argv[optind];
301301

302-
Assert(dbName);
302+
Assert(dbname);
303303

304304
if (IsUnderPostmaster&&ExecBackend&&MyProc/* ordinary backend */)
305305
{
@@ -426,7 +426,7 @@ BootstrapMain(int argc, char *argv[])
426426
/*
427427
* backend initialization
428428
*/
429-
InitPostgres(dbName,NULL);
429+
InitPostgres(dbname,NULL);
430430

431431
for (i=0;i<MAXATTR;i++)
432432
{

‎src/backend/tcop/postgres.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.334 2003/05/0604:16:35 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.335 2003/05/0605:15:45 momjian Exp $
1212
*
1313
* NOTES
1414
* this is the "main" module of the postgres backend and
@@ -1748,7 +1748,7 @@ int
17481748
PostgresMain(intargc,char*argv[],constchar*username)
17491749
{
17501750
intflag;
1751-
constchar*DBName=NULL;
1751+
constchar*dbname=NULL;
17521752
char*potential_DataDir=NULL;
17531753
boolsecure;
17541754
interrs=0;
@@ -1987,7 +1987,7 @@ PostgresMain(int argc, char *argv[], const char *username)
19871987
*/
19881988
if (secure)
19891989
{
1990-
DBName=strdup(optarg);
1990+
dbname=strdup(optarg);
19911991
secure= false;/* subsequent switches are NOT
19921992
* secure */
19931993
ctx=PGC_BACKEND;
@@ -2238,7 +2238,7 @@ PostgresMain(int argc, char *argv[], const char *username)
22382238
if (IsUnderPostmaster)
22392239
{
22402240
/* noninteractive case: nothing should be left after switches */
2241-
if (errs||argc!=optind||DBName==NULL)
2241+
if (errs||argc!=optind||dbname==NULL)
22422242
{
22432243
elog(WARNING,"%s: invalid command line arguments\nTry -? for help.",
22442244
argv[0]);
@@ -2260,8 +2260,8 @@ PostgresMain(int argc, char *argv[], const char *username)
22602260
proc_exit(1);
22612261
}
22622262
elseif (argc-optind==1)
2263-
DBName=argv[optind];
2264-
elseif ((DBName=username)==NULL)
2263+
dbname=argv[optind];
2264+
elseif ((dbname=username)==NULL)
22652265
{
22662266
elog(WARNING,"%s: user name undefined and no database specified",
22672267
argv[0]);
@@ -2322,7 +2322,7 @@ PostgresMain(int argc, char *argv[], const char *username)
23222322
* that involves database access should be there, not here.
23232323
*/
23242324
elog(DEBUG2,"InitPostgres");
2325-
InitPostgres(DBName,username);
2325+
InitPostgres(dbname,username);
23262326

23272327
SetProcessingMode(NormalProcessing);
23282328

@@ -2344,7 +2344,7 @@ PostgresMain(int argc, char *argv[], const char *username)
23442344
if (!IsUnderPostmaster)
23452345
{
23462346
puts("\nPOSTGRES backend interactive interface ");
2347-
puts("$Revision: 1.334 $ $Date: 2003/05/0604:16:35 $\n");
2347+
puts("$Revision: 1.335 $ $Date: 2003/05/0605:15:45 $\n");
23482348
}
23492349

23502350
/*

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp