Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 5dafb69

Browse files
committed
Re-order 'else' clause for clarity.
1 parent b4176e9 commit 5dafb69

File tree

1 file changed

+22
-22
lines changed
  • src/backend/utils/misc

1 file changed

+22
-22
lines changed

src/backend/utils/misc/guc.c

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Written by Peter Eisentraut <peter_e@gmx.net>.
1111
*
1212
* IDENTIFICATION
13-
* $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.262 2005/05/15 00:26:19 momjian Exp $
13+
* $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.263 2005/05/27 18:33:30 momjian Exp $
1414
*
1515
*--------------------------------------------------------------------
1616
*/
@@ -2500,20 +2500,20 @@ SelectConfigFiles(const char *userDoption, const char *progname)
25002500
*/
25012501
if (ConfigFileName)
25022502
fname = make_absolute_path(ConfigFileName);
2503-
else if (!configdir)
2503+
else if (configdir)
2504+
{
2505+
fname = guc_malloc(FATAL,
2506+
strlen(configdir) + strlen(CONFIG_FILENAME) + 2);
2507+
sprintf(fname, "%s/%s", configdir, CONFIG_FILENAME);
2508+
}
2509+
else
25042510
{
25052511
write_stderr("%s does not know where to find the server configuration file.\n"
25062512
"You must specify the --config-file or -D invocation "
25072513
"option or set the PGDATA environment variable.\n",
25082514
progname);
25092515
return false;
25102516
}
2511-
else
2512-
{
2513-
fname = guc_malloc(FATAL,
2514-
strlen(configdir) + strlen(CONFIG_FILENAME) + 2);
2515-
sprintf(fname, "%s/%s", configdir, CONFIG_FILENAME);
2516-
}
25172517

25182518
/*
25192519
* Set the ConfigFileName GUC variable to its final value, ensuring
@@ -2568,7 +2568,13 @@ SelectConfigFiles(const char *userDoption, const char *progname)
25682568
*/
25692569
if (HbaFileName)
25702570
fname = make_absolute_path(HbaFileName);
2571-
else if (!configdir)
2571+
else if (configdir)
2572+
{
2573+
fname = guc_malloc(FATAL,
2574+
strlen(configdir) + strlen(HBA_FILENAME) + 2);
2575+
sprintf(fname, "%s/%s", configdir, HBA_FILENAME);
2576+
}
2577+
else
25722578
{
25732579
write_stderr("%s does not know where to find the \"hba\" configuration file.\n"
25742580
"This can be specified as \"hba_file\" in \"%s\", "
@@ -2577,12 +2583,6 @@ SelectConfigFiles(const char *userDoption, const char *progname)
25772583
progname, ConfigFileName);
25782584
return false;
25792585
}
2580-
else
2581-
{
2582-
fname = guc_malloc(FATAL,
2583-
strlen(configdir) + strlen(HBA_FILENAME) + 2);
2584-
sprintf(fname, "%s/%s", configdir, HBA_FILENAME);
2585-
}
25862586
SetConfigOption("hba_file", fname, PGC_POSTMASTER, PGC_S_OVERRIDE);
25872587
free(fname);
25882588

@@ -2591,7 +2591,13 @@ SelectConfigFiles(const char *userDoption, const char *progname)
25912591
*/
25922592
if (IdentFileName)
25932593
fname = make_absolute_path(IdentFileName);
2594-
else if (!configdir)
2594+
else if (configdir)
2595+
{
2596+
fname = guc_malloc(FATAL,
2597+
strlen(configdir) + strlen(IDENT_FILENAME) + 2);
2598+
sprintf(fname, "%s/%s", configdir, IDENT_FILENAME);
2599+
}
2600+
else
25952601
{
25962602
write_stderr("%s does not know where to find the \"ident\" configuration file.\n"
25972603
"This can be specified as \"ident_file\" in \"%s\", "
@@ -2600,12 +2606,6 @@ SelectConfigFiles(const char *userDoption, const char *progname)
26002606
progname, ConfigFileName);
26012607
return false;
26022608
}
2603-
else
2604-
{
2605-
fname = guc_malloc(FATAL,
2606-
strlen(configdir) + strlen(IDENT_FILENAME) + 2);
2607-
sprintf(fname, "%s/%s", configdir, IDENT_FILENAME);
2608-
}
26092609
SetConfigOption("ident_file", fname, PGC_POSTMASTER, PGC_S_OVERRIDE);
26102610
free(fname);
26112611

0 commit comments

Comments
 (0)