From 7069dbcc317c287f98e55d5296ff7ca77fadab49 Mon Sep 17 00:00:00 2001
From: Neil Conway <neilc@samurai.com>
Date: Wed, 13 Oct 2004 01:25:13 +0000
Subject: [PATCH] More minor cosmetic improvements:

- remove another senseless "extern" keyword that was applied to a
function definition
- change a foo more function signatures from "some_type foo()" to
"some_type foo(void)"
- rewrite another K&R style function definition
- make the type of the "action" function pointer in the KeyWord struct
in src/backend/utils/adt/formatting.c more precise
---
 src/backend/executor/spi.c           |  8 ++++----
 src/backend/port/sysv_shmem.c        |  4 ++--
 src/backend/utils/adt/formatting.c   | 10 ++++++----
 src/backend/utils/mb/mbutils.c       |  4 ++--
 src/backend/utils/mb/wstrcmp.c       |  4 +---
 src/interfaces/ecpg/preproc/output.c |  2 +-
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/backend/executor/spi.c b/src/backend/executor/spi.c
index 7d0c9b8a72..b533470e1d 100644
--- a/src/backend/executor/spi.c
+++ b/src/backend/executor/spi.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/executor/spi.c,v 1.130 2004/10/12 21:54:37 petere Exp $
+ *	  $PostgreSQL: pgsql/src/backend/executor/spi.c,v 1.131 2004/10/13 01:25:10 neilc Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -348,7 +348,7 @@ SPI_execp(void *plan, Datum *Values, const char *Nulls, int tcount)
  * Passing snapshot == InvalidSnapshot will select the normal behavior of
  * fetching a new snapshot for each query.
  */
-extern int
+int
 SPI_execute_snapshot(void *plan,
 					 Datum *Values, const char *Nulls,
 					 Snapshot snapshot, Snapshot crosscheck_snapshot,
@@ -1629,13 +1629,13 @@ _SPI_cursor_operation(Portal portal, bool forward, int count,
 
 
 static MemoryContext
-_SPI_execmem()
+_SPI_execmem(void)
 {
 	return MemoryContextSwitchTo(_SPI_current->execCxt);
 }
 
 static MemoryContext
-_SPI_procmem()
+_SPI_procmem(void)
 {
 	return MemoryContextSwitchTo(_SPI_current->procCxt);
 }
diff --git a/src/backend/port/sysv_shmem.c b/src/backend/port/sysv_shmem.c
index ca1f34a28c..bff83b5621 100644
--- a/src/backend/port/sysv_shmem.c
+++ b/src/backend/port/sysv_shmem.c
@@ -10,7 +10,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/port/sysv_shmem.c,v 1.38 2004/09/24 05:27:35 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/port/sysv_shmem.c,v 1.39 2004/10/13 01:25:11 neilc Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -143,7 +143,7 @@ InternalIpcMemoryCreate(IpcMemoryKey memKey, uint32 size)
 #ifdef EXEC_BACKEND
 	memAddress = shmat(shmid, UsedShmemSegAddr, 0);
 #else
-	memAddress = shmat(shmid, 0, 0);
+	memAddress = shmat(shmid, NULL, 0);
 #endif
 #endif
 
diff --git a/src/backend/utils/adt/formatting.c b/src/backend/utils/adt/formatting.c
index 369353e6ce..a982a0071a 100644
--- a/src/backend/utils/adt/formatting.c
+++ b/src/backend/utils/adt/formatting.c
@@ -1,7 +1,7 @@
 /* -----------------------------------------------------------------------
  * formatting.c
  *
- * $PostgreSQL: pgsql/src/backend/utils/adt/formatting.c,v 1.78 2004/08/30 02:54:39 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/adt/formatting.c,v 1.79 2004/10/13 01:25:11 neilc Exp $
  *
  *
  *	 Portions Copyright (c) 1999-2004, PostgreSQL Global Development Group
@@ -129,23 +129,25 @@ typedef struct
 				type;			/* prefix / postfix			*/
 } KeySuffix;
 
+typedef struct FormatNode FormatNode;
+
 typedef struct
 {
 	char	   *name;			/* keyword			*/
 	/* action for keyword		*/
 	int			len,			/* keyword length		*/
-				(*action) (),
+				(*action) (int arg, char *inout, int suf, int flag, FormatNode *node, void *data),
 				id;				/* keyword id			*/
 	bool		isitdigit;		/* is expected output/input digit */
 } KeyWord;
 
-typedef struct
+struct FormatNode
 {
 	int			type;			/* node type			*/
 	KeyWord    *key;			/* if node type is KEYWORD	*/
 	int			character,		/* if node type is CHAR		*/
 				suffix;			/* keyword suffix		*/
-} FormatNode;
+};
 
 #define NODE_TYPE_END		1
 #define NODE_TYPE_ACTION	2
diff --git a/src/backend/utils/mb/mbutils.c b/src/backend/utils/mb/mbutils.c
index 1eee1a40dc..9718e7e73e 100644
--- a/src/backend/utils/mb/mbutils.c
+++ b/src/backend/utils/mb/mbutils.c
@@ -4,7 +4,7 @@
  * (currently mule internal code (mic) is used)
  * Tatsuo Ishii
  *
- * $PostgreSQL: pgsql/src/backend/utils/mb/mbutils.c,v 1.47 2004/08/29 05:06:51 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/mb/mbutils.c,v 1.48 2004/10/13 01:25:12 neilc Exp $
  */
 #include "postgres.h"
 
@@ -574,7 +574,7 @@ SetDatabaseEncoding(int encoding)
 }
 
 void
-SetDefaultClientEncoding()
+SetDefaultClientEncoding(void)
 {
 	ClientEncoding = &pg_enc2name_tbl[GetDatabaseEncoding()];
 }
diff --git a/src/backend/utils/mb/wstrcmp.c b/src/backend/utils/mb/wstrcmp.c
index f828c31a3a..d4e0526f61 100644
--- a/src/backend/utils/mb/wstrcmp.c
+++ b/src/backend/utils/mb/wstrcmp.c
@@ -39,9 +39,7 @@
 #include "mb/pg_wchar.h"
 
 int
-pg_char_and_wchar_strcmp(s1, s2)
-register const char *s1;
-register const pg_wchar *s2;
+pg_char_and_wchar_strcmp(const char *s1, const pg_wchar *s2)
 {
 	while ((pg_wchar) *s1 == *s2++)
 		if (*s1++ == 0)
diff --git a/src/interfaces/ecpg/preproc/output.c b/src/interfaces/ecpg/preproc/output.c
index 055ad7f039..27212ab4bc 100644
--- a/src/interfaces/ecpg/preproc/output.c
+++ b/src/interfaces/ecpg/preproc/output.c
@@ -3,7 +3,7 @@
 #include "extern.h"
 
 void
-output_line_number()
+output_line_number(void)
 {
 	if (input_filename)
 		fprintf(yyout, "\n#line %d \"%s\"\n", yylineno, input_filename);