Mark some more variables as static or include the appropriate header

petere · petere · commit 66c04c981dfe · 2014-02-08T21:21:46.000-05:00
Detected by clang's -Wmissing-variable-declarations.

From: Andres Freund &lt;andres@anarazel.de&gt;
diff --git a/src/backend/commands/event_trigger.c b/src/backend/commands/event_trigger.c
@@ -51,7 +51,7 @@ typedef struct EventTriggerQueryState
 	struct EventTriggerQueryState *previous;
 } EventTriggerQueryState;
 
-EventTriggerQueryState *currentEventTriggerState = NULL;
+static EventTriggerQueryState *currentEventTriggerState = NULL;
 
 typedef struct
 {
diff --git a/src/backend/postmaster/bgworker.c b/src/backend/postmaster/bgworker.c
@@ -90,7 +90,7 @@ struct BackgroundWorkerHandle
 	uint64	generation;
 };
 
-BackgroundWorkerArray *BackgroundWorkerData;
+static BackgroundWorkerArray *BackgroundWorkerData;
 
 /*
  * Calculate shared memory needed.
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
@@ -237,8 +237,6 @@ bool		enable_bonjour = false;
 char	   *bonjour_name;
 bool		restart_after_crash = true;
 
-char	   *output_config_variable = NULL;
-
 /* PIDs of special child processes; 0 when not running */
 static pid_t StartupPID = 0,
 			BgWriterPID = 0,
@@ -545,6 +543,7 @@ PostmasterMain(int argc, char *argv[])
 	char	   *userDoption = NULL;
 	bool		listen_addr_saved = false;
 	int			i;
+	char	   *output_config_variable = NULL;
 
 	MyProcPid = PostmasterPid = getpid();
 
diff --git a/src/backend/storage/lmgr/s_lock.c b/src/backend/storage/lmgr/s_lock.c
@@ -19,6 +19,7 @@
 #include <unistd.h>
 
 #include "storage/s_lock.h"
+#include "storage/barrier.h"
 
 slock_t		dummy_spinlock;
 
diff --git a/src/backend/utils/init/globals.c b/src/backend/utils/init/globals.c
@@ -18,6 +18,7 @@
  */
 #include "postgres.h"
 
+#include "libpq/libpq-be.h"
 #include "libpq/pqcomm.h"
 #include "miscadmin.h"
 #include "storage/backendid.h"
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
@@ -180,7 +180,7 @@ static const char *backend_options = "--single -F -O -c search_path=pg_catalog -
 #ifdef WIN32
 char	   *restrict_env;
 #endif
-const char *subdirs[] = {
+static const char *subdirs[] = {
 	"global",
 	"pg_xlog",
 	"pg_xlog/archive_status",
diff --git a/src/include/storage/pg_shmem.h b/src/include/storage/pg_shmem.h
@@ -49,14 +49,14 @@ typedef enum
 	HUGE_TLB_TRY
 } HugeTlbType;
 
-#ifdef EXEC_BACKEND
 #ifndef WIN32
 extern unsigned long UsedShmemSegID;
 #else
 extern HANDLE UsedShmemSegID;
 #endif
 extern void *UsedShmemSegAddr;
 
+#ifdef EXEC_BACKEND
 extern void PGSharedMemoryReAttach(void);
 #endif
 
diff --git a/src/interfaces/ecpg/preproc/pgc.l b/src/interfaces/ecpg/preproc/pgc.l
@@ -56,7 +56,7 @@ static bool isdefine(void);
 static bool isinformixdefine(void);
 
 char *token_start;
-int state_before;
+static int state_before;
 
 struct _yy_buffer
 {

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ typedef struct EventTriggerQueryState`
`51`	`51`	`struct EventTriggerQueryState *previous;`
`52`	`52`	`} EventTriggerQueryState;`
`53`	`53`
`54`		`-EventTriggerQueryState *currentEventTriggerState = NULL;`
	`54`	`+static EventTriggerQueryState *currentEventTriggerState = NULL;`
`55`	`55`
`56`	`56`	`typedef struct`
`57`	`57`	`{`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ static bool isdefine(void);`
`56`	`56`	`static bool isinformixdefine(void);`
`57`	`57`
`58`	`58`	`char *token_start;`
`59`		`-int state_before;`
	`59`	`+static int state_before;`
`60`	`60`
`61`	`61`	`struct _yy_buffer`
`62`	`62`	`{`