Get rid of some minor compiler warnings.

tglsfdc · tglsfdc · commit 3d87216ab9e7 · 1998-10-26T01:00:13.000Z
(HP's cc doesn't like if you forward-declare a routine static,
and then don't make it static in the actual definition...)
diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c
@@ -6,7 +6,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.62 1998/09/23 04:22:02 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.63 1998/10/26 00:59:21 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -961,7 +961,7 @@ inString(char c, char *s)
  * Reads input from fp until an end of line is seen.
  */
 
-void
+static void
 CopyReadNewline(FILE *fp, int *newline)
 {
 	if (!*newline)
diff --git a/src/backend/commands/variable.c b/src/backend/commands/variable.c
@@ -2,7 +2,7 @@
  * Routines for handling of 'SET var TO',
  *	'SHOW var' and 'RESET var' statements.
  *
- * $Id: variable.c,v 1.16 1998/10/14 05:09:58 momjian Exp $
+ * $Id: variable.c,v 1.17 1998/10/26 00:59:22 tgl Exp $
  *
  */
 
@@ -307,7 +307,7 @@ parse_cost_heap(const char *value)
 	return TRUE;
 }
 
-bool
+static bool
 show_cost_heap()
 {
 
@@ -344,7 +344,7 @@ parse_cost_index(const char *value)
 	return TRUE;
 }
 
-bool
+static bool
 show_cost_index()
 {
 
@@ -464,7 +464,7 @@ show_date()
 	return TRUE;
 }
 
-bool
+static bool
 reset_date()
 {
 	DateStyle = USE_POSTGRES_DATES;
@@ -550,7 +550,7 @@ show_timezone()
  * in a core dump (under Linux anyway).
  * - thomas 1998-01-26
  */
-bool
+static bool
 reset_timezone()
 {
 	/* no time zone has been set in this session? */
@@ -598,7 +598,8 @@ parse_query_limit(const char *value)
     reset_query_limit();
     return(TRUE);
   }
-  limit = pg_atoi(value, sizeof(int32), '\0');
+  /* why is pg_atoi's arg not declared "const char *" ? */
+  limit = pg_atoi((char *) value, sizeof(int32), '\0');
   if (limit <= -1) {
     elog(ERROR, "Bad value for # of query limit (%s)", value);
   }
@@ -766,7 +767,7 @@ show_ksqo()
 	return TRUE;
 }
 
-bool
+static bool
 reset_ksqo()
 {
 	_use_keyset_query_optimizer = false;
diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
@@ -6,7 +6,7 @@
  * Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Id: fd.c,v 1.34 1998/09/01 04:31:45 momjian Exp $
+ *	  $Id: fd.c,v 1.35 1998/10/26 01:00:13 tgl Exp $
  *
  * NOTES:
  *
@@ -175,7 +175,7 @@ pg_fsync(int fd)
 
 #define fsync pg_fsync
 
-long
+static long
 pg_nofile(void)
 {
 	static long no_files = 0;

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`*`
`7`	`7`	`*`
`8`	`8`	`* IDENTIFICATION`
`9`		`- * $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.62 1998/09/23 04:22:02 momjian Exp $`
	`9`	`+ * $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.63 1998/10/26 00:59:21 tgl Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -961,7 +961,7 @@ inString(char c, char *s)`
`961`	`961`	`* Reads input from fp until an end of line is seen.`
`962`	`962`	`*/`
`963`	`963`
`964`		`-void`
	`964`	`+static void`
`965`	`965`	`CopyReadNewline(FILE fp, int newline)`
`966`	`966`	`{`
`967`	`967`	`if (!*newline)`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`* Routines for handling of 'SET var TO',`
`3`	`3`	`* 'SHOW var' and 'RESET var' statements.`
`4`	`4`	`*`
`5`		`- * $Id: variable.c,v 1.16 1998/10/14 05:09:58 momjian Exp $`
	`5`	`+ * $Id: variable.c,v 1.17 1998/10/26 00:59:22 tgl Exp $`
`6`	`6`	`*`
`7`	`7`	`*/`
`8`	`8`
`@@ -307,7 +307,7 @@ parse_cost_heap(const char *value)`
`307`	`307`	`return TRUE;`
`308`	`308`	`}`
`309`	`309`
`310`		`-bool`
	`310`	`+static bool`
`311`	`311`	`show_cost_heap()`
`312`	`312`	`{`
`313`	`313`
`@@ -344,7 +344,7 @@ parse_cost_index(const char *value)`
`344`	`344`	`return TRUE;`
`345`	`345`	`}`
`346`	`346`
`347`		`-bool`
	`347`	`+static bool`
`348`	`348`	`show_cost_index()`
`349`	`349`	`{`
`350`	`350`
`@@ -464,7 +464,7 @@ show_date()`
`464`	`464`	`return TRUE;`
`465`	`465`	`}`
`466`	`466`
`467`		`-bool`
	`467`	`+static bool`
`468`	`468`	`reset_date()`
`469`	`469`	`{`
`470`	`470`	`DateStyle = USE_POSTGRES_DATES;`
`@@ -550,7 +550,7 @@ show_timezone()`
`550`	`550`	`* in a core dump (under Linux anyway).`
`551`	`551`	`* - thomas 1998-01-26`
`552`	`552`	`*/`
`553`		`-bool`
	`553`	`+static bool`
`554`	`554`	`reset_timezone()`
`555`	`555`	`{`
`556`	`556`	`/* no time zone has been set in this session? */`
`@@ -598,7 +598,8 @@ parse_query_limit(const char *value)`
`598`	`598`	`reset_query_limit();`
`599`	`599`	`return(TRUE);`
`600`	`600`	`}`
`601`		`- limit = pg_atoi(value, sizeof(int32), '\0');`
	`601`	`+ /* why is pg_atoi's arg not declared "const char " ? /`
	`602`	`+ limit = pg_atoi((char *) value, sizeof(int32), '\0');`
`602`	`603`	`if (limit <= -1) {`
`603`	`604`	`elog(ERROR, "Bad value for # of query limit (%s)", value);`
`604`	`605`	`}`
`@@ -766,7 +767,7 @@ show_ksqo()`
`766`	`767`	`return TRUE;`
`767`	`768`	`}`
`768`	`769`
`769`		`-bool`
	`770`	`+static bool`
`770`	`771`	`reset_ksqo()`
`771`	`772`	`{`
`772`	`773`	`_use_keyset_query_optimizer = false;`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`* Copyright (c) 1994, Regents of the University of California`
`7`	`7`	`*`
`8`	`8`	`* IDENTIFICATION`
`9`		`- * $Id: fd.c,v 1.34 1998/09/01 04:31:45 momjian Exp $`
	`9`	`+ * $Id: fd.c,v 1.35 1998/10/26 01:00:13 tgl Exp $`
`10`	`10`	`*`
`11`	`11`	`* NOTES:`
`12`	`12`	`*`
`@@ -175,7 +175,7 @@ pg_fsync(int fd)`
`175`	`175`
`176`	`176`	`#define fsync pg_fsync`
`177`	`177`
`178`		`-long`
	`178`	`+static long`
`179`	`179`	`pg_nofile(void)`
`180`	`180`	`{`
`181`	`181`	`static long no_files = 0;`