From 66c04c981dfe7c1d1e633dddcecf01982d0bde65 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Sat, 8 Feb 2014 21:21:46 -0500 Subject: [PATCH] Mark some more variables as static or include the appropriate header Detected by clang's -Wmissing-variable-declarations. From: Andres Freund --- src/backend/commands/event_trigger.c | 2 +- src/backend/postmaster/bgworker.c | 2 +- src/backend/postmaster/postmaster.c | 3 +-- src/backend/storage/lmgr/s_lock.c | 1 + src/backend/utils/init/globals.c | 1 + src/bin/initdb/initdb.c | 2 +- src/include/storage/pg_shmem.h | 2 +- src/interfaces/ecpg/preproc/pgc.l | 2 +- 8 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/backend/commands/event_trigger.c b/src/backend/commands/event_trigger.c index 59f0842c5c..024a4778a9 100644 --- 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 index 6a8a541f6d..11fd7a5160 100644 --- 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 index 5468eb1b77..7adc410b43 100644 --- 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 index 8ad2ad5cf8..b3987494c1 100644 --- a/src/backend/storage/lmgr/s_lock.c +++ b/src/backend/storage/lmgr/s_lock.c @@ -19,6 +19,7 @@ #include #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 index 63c951e516..be74835772 100644 --- 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 index a71320d945..94151acb48 100644 --- 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 index df094e801d..0d607298fb 100644 --- a/src/include/storage/pg_shmem.h +++ b/src/include/storage/pg_shmem.h @@ -49,7 +49,6 @@ typedef enum HUGE_TLB_TRY } HugeTlbType; -#ifdef EXEC_BACKEND #ifndef WIN32 extern unsigned long UsedShmemSegID; #else @@ -57,6 +56,7 @@ 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 index 9606d86e9e..3bd63b353d 100644 --- 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 { -- 2.40.0