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

tglsfdc · tglsfdc · commit 450d9f2d6669 · 2015-01-12T16:08:46.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
@@ -274,49 +274,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;
@@ -333,7 +333,7 @@ PLy_quote_literal(PyObject *self, PyObject *args)
 	return ret;
 }
 
-PyObject *
+static PyObject *
 PLy_quote_nullable(PyObject *self, PyObject *args)
 {
 	const char *str;
@@ -353,7 +353,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
`@@ -274,49 +274,49 @@ PLy_generate_spi_exceptions(PyObject mod, PyObject base)`
`274`	`274`	`*/`
`275`	`275`	`static PyObject PLy_output(volatile int, PyObject , PyObject *);`
`276`	`276`
`277`		`-PyObject *`
	`277`	`+static PyObject *`
`278`	`278`	`PLy_debug(PyObject self, PyObject args)`
`279`	`279`	`{`
`280`	`280`	`return PLy_output(DEBUG2, self, args);`
`281`	`281`	`}`
`282`	`282`
`283`		`-PyObject *`
	`283`	`+static PyObject *`
`284`	`284`	`PLy_log(PyObject self, PyObject args)`
`285`	`285`	`{`
`286`	`286`	`return PLy_output(LOG, self, args);`
`287`	`287`	`}`
`288`	`288`
`289`		`-PyObject *`
	`289`	`+static PyObject *`
`290`	`290`	`PLy_info(PyObject self, PyObject args)`
`291`	`291`	`{`
`292`	`292`	`return PLy_output(INFO, self, args);`
`293`	`293`	`}`
`294`	`294`
`295`		`-PyObject *`
	`295`	`+static PyObject *`
`296`	`296`	`PLy_notice(PyObject self, PyObject args)`
`297`	`297`	`{`
`298`	`298`	`return PLy_output(NOTICE, self, args);`
`299`	`299`	`}`
`300`	`300`
`301`		`-PyObject *`
	`301`	`+static PyObject *`
`302`	`302`	`PLy_warning(PyObject self, PyObject args)`
`303`	`303`	`{`
`304`	`304`	`return PLy_output(WARNING, self, args);`
`305`	`305`	`}`
`306`	`306`
`307`		`-PyObject *`
	`307`	`+static PyObject *`
`308`	`308`	`PLy_error(PyObject self, PyObject args)`
`309`	`309`	`{`
`310`	`310`	`return PLy_output(ERROR, self, args);`
`311`	`311`	`}`
`312`	`312`
`313`		`-PyObject *`
	`313`	`+static PyObject *`
`314`	`314`	`PLy_fatal(PyObject self, PyObject args)`
`315`	`315`	`{`
`316`	`316`	`return PLy_output(FATAL, self, args);`
`317`	`317`	`}`
`318`	`318`
`319`		`-PyObject *`
	`319`	`+static PyObject *`
`320`	`320`	`PLy_quote_literal(PyObject self, PyObject args)`
`321`	`321`	`{`
`322`	`322`	`const char *str;`
`@@ -333,7 +333,7 @@ PLy_quote_literal(PyObject self, PyObject args)`
`333`	`333`	`return ret;`
`334`	`334`	`}`
`335`	`335`
`336`		`-PyObject *`
	`336`	`+static PyObject *`
`337`	`337`	`PLy_quote_nullable(PyObject self, PyObject args)`
`338`	`338`	`{`
`339`	`339`	`const char *str;`
`@@ -353,7 +353,7 @@ PLy_quote_nullable(PyObject self, PyObject args)`
`353`	`353`	`return ret;`
`354`	`354`	`}`
`355`	`355`
`356`		`-PyObject *`
	`356`	`+static PyObject *`
`357`	`357`	`PLy_quote_ident(PyObject self, PyObject args)`
`358`	`358`	`{`
`359`	`359`	`const char *str;`