Clean up compiler warnings.

tglsfdc · tglsfdc · commit 26adbc7b48ff · 2000-11-08T23:24:24.000Z
diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.64 2000/11/08 16:59:49 petere Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.65 2000/11/08 23:24:24 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -387,7 +387,7 @@ get_user_info(Oid use_sysid, bool *use_super, bool *use_createdb)
 static char *
 resolve_alt_dbpath(const char * dbpath, Oid dboid)
 {
-	char * prefix;
+	const char * prefix;
 	char * ret;
 	size_t len;
 
@@ -396,11 +396,10 @@ resolve_alt_dbpath(const char * dbpath, Oid dboid)
 
 	if (strchr(dbpath, '/'))
 	{
-#ifdef ALLOW_ABSOLUTE_DBPATHS
-		prefix = dbpath;
-#else
+#ifndef ALLOW_ABSOLUTE_DBPATHS
 		elog(ERROR, "Absolute paths are not allowed as database locations");
 #endif
+		prefix = dbpath;
 	}
 	else
 	{

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/commands/dbcommands.c,v 1.64 2000/11/08 16:59:49 petere Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.65 2000/11/08 23:24:24 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -387,7 +387,7 @@ get_user_info(Oid use_sysid, bool use_super, bool use_createdb)`
`387`	`387`	`static char *`
`388`	`388`	`resolve_alt_dbpath(const char * dbpath, Oid dboid)`
`389`	`389`	`{`
`390`		`- char * prefix;`
	`390`	`+ const char * prefix;`
`391`	`391`	`char * ret;`
`392`	`392`	`size_t len;`
`393`	`393`
`@@ -396,11 +396,10 @@ resolve_alt_dbpath(const char * dbpath, Oid dboid)`
`396`	`396`
`397`	`397`	`if (strchr(dbpath, '/'))`
`398`	`398`	`{`
`399`		`-#ifdef ALLOW_ABSOLUTE_DBPATHS`
`400`		`- prefix = dbpath;`
`401`		`-#else`
	`399`	`+#ifndef ALLOW_ABSOLUTE_DBPATHS`
`402`	`400`	`elog(ERROR, "Absolute paths are not allowed as database locations");`
`403`	`401`	`#endif`
	`402`	`+ prefix = dbpath;`
`404`	`403`	`}`
`405`	`404`	`else`
`406`	`405`	`{`