Small pg_config.c cleanup.

bmomjian · bmomjian · commit b6a40d895ee2 · 2004-08-01T14:01:36.000Z
diff --git a/src/bin/pg_config/pg_config.c b/src/bin/pg_config/pg_config.c
@@ -17,7 +17,7 @@
  *
  * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/pg_config/pg_config.c,v 1.1 2004/08/01 13:54:05 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_config/pg_config.c,v 1.2 2004/08/01 14:01:36 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -28,7 +28,7 @@
 
 #define _(x) gettext((x))
 
-char * progname;
+static char *progname;
 
 static void
 help()
@@ -67,8 +67,6 @@ main (int argc, char ** argv)
 
     progname = (char *)get_progname(argv[0]);
 
-	
-
 	if (argc < 2)
 	{
 		fprintf(stderr,_("%s: argument required\n"),progname);
@@ -83,11 +81,9 @@ main (int argc, char ** argv)
 			strcmp(argv[i],"--includedir-server") == 0 ||
 			strcmp(argv[i],"--libdir") == 0 ||
 			strcmp(argv[i],"--pkglibdir") == 0 ||
-			strcmp(argv[i],"--configure") == 0
-			)
+			strcmp(argv[i],"--configure") == 0)
 		{
 			/* come back to these later */
-
 			continue; 
 		}
 
@@ -114,23 +110,19 @@ main (int argc, char ** argv)
 		exit(1);
 	}
 
-
-
 	for (i=1; i < argc; i++)
 	{
 		if (strcmp(argv[i],"--configure") == 0)
 		{
 			/* the VAL_CONFIGURE macro must be defined by the Makefile */
-
 			printf("%s\n",VAL_CONFIGURE);
 			continue;
 		}
 
 		if (strcmp(argv[i],"--bindir") == 0)
 		{
 			/* assume we are located in the bindir */
-
-			char * lastsep;
+			char *lastsep;
 			strcpy(otherpath,mypath);
 			lastsep = strrchr(otherpath,'/');
 			if (lastsep)
@@ -146,8 +138,6 @@ main (int argc, char ** argv)
 			get_pkglib_path(mypath,otherpath);
 
 		printf("%s\n",otherpath);
-
-
 	}
 
 	return 0;

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`*`
`18`	`18`	`* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group`
`19`	`19`	`*`
`20`		`- * $PostgreSQL: pgsql/src/bin/pg_config/pg_config.c,v 1.1 2004/08/01 13:54:05 momjian Exp $`
	`20`	`+ * $PostgreSQL: pgsql/src/bin/pg_config/pg_config.c,v 1.2 2004/08/01 14:01:36 momjian Exp $`
`21`	`21`	`*`
`22`	`22`	`*-------------------------------------------------------------------------`
`23`	`23`	`*/`
`@@ -28,7 +28,7 @@`
`28`	`28`
`29`	`29`	`#define _(x) gettext((x))`
`30`	`30`
`31`		`-char * progname;`
	`31`	`+static char *progname;`
`32`	`32`
`33`	`33`	`static void`
`34`	`34`	`help()`
`@@ -67,8 +67,6 @@ main (int argc, char ** argv)`
`67`	`67`
`68`	`68`	`progname = (char *)get_progname(argv[0]);`
`69`	`69`
`70`		`-`
`71`		`-`
`72`	`70`	`if (argc < 2)`
`73`	`71`	`{`
`74`	`72`	`fprintf(stderr,_("%s: argument required\n"),progname);`
`@@ -83,11 +81,9 @@ main (int argc, char ** argv)`
`83`	`81`	`strcmp(argv[i],"--includedir-server") == 0 \|\|`
`84`	`82`	`strcmp(argv[i],"--libdir") == 0 \|\|`
`85`	`83`	`strcmp(argv[i],"--pkglibdir") == 0 \|\|`
`86`		`- strcmp(argv[i],"--configure") == 0`
`87`		`- )`
	`84`	`+ strcmp(argv[i],"--configure") == 0)`
`88`	`85`	`{`
`89`	`86`	`/* come back to these later */`
`90`		`-`
`91`	`87`	`continue;`
`92`	`88`	`}`
`93`	`89`
`@@ -114,23 +110,19 @@ main (int argc, char ** argv)`
`114`	`110`	`exit(1);`
`115`	`111`	`}`
`116`	`112`
`117`		`-`
`118`		`-`
`119`	`113`	`for (i=1; i < argc; i++)`
`120`	`114`	`{`
`121`	`115`	`if (strcmp(argv[i],"--configure") == 0)`
`122`	`116`	`{`
`123`	`117`	`/* the VAL_CONFIGURE macro must be defined by the Makefile */`
`124`		`-`
`125`	`118`	`printf("%s\n",VAL_CONFIGURE);`
`126`	`119`	`continue;`
`127`	`120`	`}`
`128`	`121`
`129`	`122`	`if (strcmp(argv[i],"--bindir") == 0)`
`130`	`123`	`{`
`131`	`124`	`/* assume we are located in the bindir */`
`132`		`-`
`133`		`- char * lastsep;`
	`125`	`+ char *lastsep;`
`134`	`126`	`strcpy(otherpath,mypath);`
`135`	`127`	`lastsep = strrchr(otherpath,'/');`
`136`	`128`	`if (lastsep)`
`@@ -146,8 +138,6 @@ main (int argc, char ** argv)`
`146`	`138`	`get_pkglib_path(mypath,otherpath);`
`147`	`139`
`148`	`140`	`printf("%s\n",otherpath);`
`149`		`-`
`150`		`-`
`151`	`141`	`}`
`152`	`142`
`153`	`143`	`return 0;`