Fix several places where a function was declared static and then defined

tglsfdc · tglsfdc · commit bfd06a713b4e · 2009-06-12T16:17:29.000Z
without static.  Per testing with a compiler that complains about this.
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
@@ -55,7 +55,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/postmaster/autovacuum.c,v 1.98 2009/06/11 14:49:00 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/postmaster/autovacuum.c,v 1.99 2009/06/12 16:17:29 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -2327,7 +2327,7 @@ do_autovacuum(void)
  * Given a relation's pg_class tuple, return the AutoVacOpts portion of
  * reloptions, if set; otherwise, return NULL.
  */
-AutoVacOpts *
+static AutoVacOpts *
 extract_autovac_opts(HeapTuple tup, TupleDesc pg_class_desc)
 {
 	bytea	   *relopts;
diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c
@@ -8,7 +8,7 @@
  *
  * Copyright (c) 2000-2009, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.216 2009/06/11 14:49:08 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.217 2009/06/12 16:17:29 tgl Exp $
  */
 #include "postgres_fe.h"
 
@@ -2073,7 +2073,7 @@ describeRoles(const char *pattern, bool verbose)
 	return true;
 }
 
-void
+static void
 add_role_attribute(PQExpBuffer buf, const char *const str)
 {
 	if (buf->len > 0)
diff --git a/src/bin/psql/print.c b/src/bin/psql/print.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2009, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/print.c,v 1.115 2009/06/11 14:49:08 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/print.c,v 1.116 2009/06/12 16:17:29 tgl Exp $
  */
 #include "postgres_fe.h"
 
@@ -2170,7 +2170,7 @@ printTableCleanup(printTableContent *const content)
  *
  * Setup pager if required
  */
-void
+static void
 IsPagerNeeded(const printTableContent *cont, const int extra_lines, FILE **fout,
 			  bool *is_pager)
 {

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@`
`55`	`55`	`*`
`56`	`56`	`*`
`57`	`57`	`* IDENTIFICATION`
`58`		`- * $PostgreSQL: pgsql/src/backend/postmaster/autovacuum.c,v 1.98 2009/06/11 14:49:00 momjian Exp $`
	`58`	`+ * $PostgreSQL: pgsql/src/backend/postmaster/autovacuum.c,v 1.99 2009/06/12 16:17:29 tgl Exp $`
`59`	`59`	`*`
`60`	`60`	`*-------------------------------------------------------------------------`
`61`	`61`	`*/`
`@@ -2327,7 +2327,7 @@ do_autovacuum(void)`
`2327`	`2327`	`* Given a relation's pg_class tuple, return the AutoVacOpts portion of`
`2328`	`2328`	`* reloptions, if set; otherwise, return NULL.`
`2329`	`2329`	`*/`
`2330`		`-AutoVacOpts *`
	`2330`	`+static AutoVacOpts *`
`2331`	`2331`	`extract_autovac_opts(HeapTuple tup, TupleDesc pg_class_desc)`
`2332`	`2332`	`{`
`2333`	`2333`	`bytea *relopts;`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`* Copyright (c) 2000-2009, PostgreSQL Global Development Group`
`10`	`10`	`*`
`11`		`- * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.216 2009/06/11 14:49:08 momjian Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.217 2009/06/12 16:17:29 tgl Exp $`
`12`	`12`	`*/`
`13`	`13`	`#include "postgres_fe.h"`
`14`	`14`
`@@ -2073,7 +2073,7 @@ describeRoles(const char *pattern, bool verbose)`
`2073`	`2073`	`return true;`
`2074`	`2074`	`}`
`2075`	`2075`
`2076`		`-void`
	`2076`	`+static void`
`2077`	`2077`	`add_role_attribute(PQExpBuffer buf, const char *const str)`
`2078`	`2078`	`{`
`2079`	`2079`	`if (buf->len > 0)`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright (c) 2000-2009, PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $PostgreSQL: pgsql/src/bin/psql/print.c,v 1.115 2009/06/11 14:49:08 momjian Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/bin/psql/print.c,v 1.116 2009/06/12 16:17:29 tgl Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include "postgres_fe.h"`
`9`	`9`
`@@ -2170,7 +2170,7 @@ printTableCleanup(printTableContent *const content)`
`2170`	`2170`	`*`
`2171`	`2171`	`* Setup pager if required`
`2172`	`2172`	`*/`
`2173`		`-void`
	`2173`	`+static void`
`2174`	`2174`	`IsPagerNeeded(const printTableContent cont, const int extra_lines, FILE *fout,`
`2175`	`2175`	`bool *is_pager)`
`2176`	`2176`	`{`