Fix some functions that were declared static then defined not-static.

tglsfdc · tglsfdc · commit 7391e2513f48 · 2015-01-12T16:08:43.000-05:00
Per testing with a compiler that whines about this.
diff --git a/src/pl/plpython/plpy_main.c b/src/pl/plpython/plpy_main.c
@@ -123,7 +123,7 @@ _PG_init(void)
  * This should only be called once from _PG_init. Initialize the Python
  * interpreter and global data.
  */
-void
+static void
 PLy_init_interp(void)
 {
 	static PyObject *PLy_interp_safe_globals = NULL;
diff --git a/src/pl/plpython/plpy_plpymodule.c b/src/pl/plpython/plpy_plpymodule.c
@@ -273,49 +273,49 @@ PLy_generate_spi_exceptions(PyObject *mod, PyObject *base)
  */
 static PyObject *PLy_output(volatile int, PyObject *, PyObject *);
 
-PyObject *
+static PyObject *
 PLy_debug(PyObject *self, PyObject *args)
 {
 	return PLy_output(DEBUG2, self, args);
 }
 
-PyObject *
+static PyObject *
 PLy_log(PyObject *self, PyObject *args)
 {
 	return PLy_output(LOG, self, args);
 }
 
-PyObject *
+static PyObject *
 PLy_info(PyObject *self, PyObject *args)
 {
 	return PLy_output(INFO, self, args);
 }
 
-PyObject *
+static PyObject *
 PLy_notice(PyObject *self, PyObject *args)
 {
 	return PLy_output(NOTICE, self, args);
 }
 
-PyObject *
+static PyObject *
 PLy_warning(PyObject *self, PyObject *args)
 {
 	return PLy_output(WARNING, self, args);
 }
 
-PyObject *
+static PyObject *
 PLy_error(PyObject *self, PyObject *args)
 {
 	return PLy_output(ERROR, self, args);
 }
 
-PyObject *
+static PyObject *
 PLy_fatal(PyObject *self, PyObject *args)
 {
 	return PLy_output(FATAL, self, args);
 }
 
-PyObject *
+static PyObject *
 PLy_quote_literal(PyObject *self, PyObject *args)
 {
 	const char *str;
@@ -332,7 +332,7 @@ PLy_quote_literal(PyObject *self, PyObject *args)
 	return ret;
 }
 
-PyObject *
+static PyObject *
 PLy_quote_nullable(PyObject *self, PyObject *args)
 {
 	const char *str;
@@ -352,7 +352,7 @@ PLy_quote_nullable(PyObject *self, PyObject *args)
 	return ret;
 }
 
-PyObject *
+static PyObject *
 PLy_quote_ident(PyObject *self, PyObject *args)
 {
 	const char *str;

Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ _PG_init(void)`
`123`	`123`	`* This should only be called once from _PG_init. Initialize the Python`
`124`	`124`	`* interpreter and global data.`
`125`	`125`	`*/`
`126`		`-void`
	`126`	`+static void`
`127`	`127`	`PLy_init_interp(void)`
`128`	`128`	`{`
`129`	`129`	`static PyObject *PLy_interp_safe_globals = NULL;`
Original file line number	Diff line number	Diff line change
`@@ -273,49 +273,49 @@ PLy_generate_spi_exceptions(PyObject mod, PyObject base)`
`273`	`273`	`*/`
`274`	`274`	`static PyObject PLy_output(volatile int, PyObject , PyObject *);`
`275`	`275`
`276`		`-PyObject *`
	`276`	`+static PyObject *`
`277`	`277`	`PLy_debug(PyObject self, PyObject args)`
`278`	`278`	`{`
`279`	`279`	`return PLy_output(DEBUG2, self, args);`
`280`	`280`	`}`
`281`	`281`
`282`		`-PyObject *`
	`282`	`+static PyObject *`
`283`	`283`	`PLy_log(PyObject self, PyObject args)`
`284`	`284`	`{`
`285`	`285`	`return PLy_output(LOG, self, args);`
`286`	`286`	`}`
`287`	`287`
`288`		`-PyObject *`
	`288`	`+static PyObject *`
`289`	`289`	`PLy_info(PyObject self, PyObject args)`
`290`	`290`	`{`
`291`	`291`	`return PLy_output(INFO, self, args);`
`292`	`292`	`}`
`293`	`293`
`294`		`-PyObject *`
	`294`	`+static PyObject *`
`295`	`295`	`PLy_notice(PyObject self, PyObject args)`
`296`	`296`	`{`
`297`	`297`	`return PLy_output(NOTICE, self, args);`
`298`	`298`	`}`
`299`	`299`
`300`		`-PyObject *`
	`300`	`+static PyObject *`
`301`	`301`	`PLy_warning(PyObject self, PyObject args)`
`302`	`302`	`{`
`303`	`303`	`return PLy_output(WARNING, self, args);`
`304`	`304`	`}`
`305`	`305`
`306`		`-PyObject *`
	`306`	`+static PyObject *`
`307`	`307`	`PLy_error(PyObject self, PyObject args)`
`308`	`308`	`{`
`309`	`309`	`return PLy_output(ERROR, self, args);`
`310`	`310`	`}`
`311`	`311`
`312`		`-PyObject *`
	`312`	`+static PyObject *`
`313`	`313`	`PLy_fatal(PyObject self, PyObject args)`
`314`	`314`	`{`
`315`	`315`	`return PLy_output(FATAL, self, args);`
`316`	`316`	`}`
`317`	`317`
`318`		`-PyObject *`
	`318`	`+static PyObject *`
`319`	`319`	`PLy_quote_literal(PyObject self, PyObject args)`
`320`	`320`	`{`
`321`	`321`	`const char *str;`
`@@ -332,7 +332,7 @@ PLy_quote_literal(PyObject self, PyObject args)`
`332`	`332`	`return ret;`
`333`	`333`	`}`
`334`	`334`
`335`		`-PyObject *`
	`335`	`+static PyObject *`
`336`	`336`	`PLy_quote_nullable(PyObject self, PyObject args)`
`337`	`337`	`{`
`338`	`338`	`const char *str;`
`@@ -352,7 +352,7 @@ PLy_quote_nullable(PyObject self, PyObject args)`
`352`	`352`	`return ret;`
`353`	`353`	`}`
`354`	`354`
`355`		`-PyObject *`
	`355`	`+static PyObject *`
`356`	`356`	`PLy_quote_ident(PyObject self, PyObject args)`
`357`	`357`	`{`
`358`	`358`	`const char *str;`