Mark variables 'static' where possible. Move GinFuzzySearchLimit to ginget.c

hlinnaka · hlinnaka · commit 30b96549ab41 · 2013-12-16T11:41:17.000+02:00
Per "clang -Wmissing-variable-declarations" output, posted by Andres Freund.
I didn't silence all those warnings, though, only the most obvious cases.
diff --git a/src/backend/access/gin/ginget.c b/src/backend/access/gin/ginget.c
@@ -20,6 +20,8 @@
 #include "utils/datum.h"
 #include "utils/memutils.h"
 
+/* GUC parameter */
+int			GinFuzzySearchLimit = 0;
 
 typedef struct pendingPosition
 {
diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c
@@ -238,7 +238,7 @@ typedef struct
 	uint32		count[FAST_PATH_STRONG_LOCK_HASH_PARTITIONS];
 } FastPathStrongRelationLockData;
 
-FastPathStrongRelationLockData *FastPathStrongRelationLocks;
+static FastPathStrongRelationLockData *FastPathStrongRelationLocks;
 
 
 /*
diff --git a/src/backend/utils/cache/relfilenodemap.c b/src/backend/utils/cache/relfilenodemap.c
@@ -33,7 +33,7 @@
 static HTAB *RelfilenodeMapHash = NULL;
 
 /* built first time through in InitializeRelfilenodeMap */
-ScanKeyData relfilenode_skey[2];
+static ScanKeyData relfilenode_skey[2];
 
 typedef struct
 {
diff --git a/src/backend/utils/init/globals.c b/src/backend/utils/init/globals.c
@@ -122,5 +122,3 @@ int			VacuumPageDirty = 0;
 
 int			VacuumCostBalance = 0;		/* working state for vacuum */
 bool		VacuumCostActive = false;
-
-int			GinFuzzySearchLimit = 0;
diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c
@@ -34,18 +34,18 @@
 
 
 /* Global options */
-char	   *basedir = NULL;
+static char *basedir = NULL;
 static char *xlog_dir = "";
-char		format = 'p';		/* p(lain)/t(ar) */
-char	   *label = "pg_basebackup base backup";
-bool		showprogress = false;
-int			verbose = 0;
-int			compresslevel = 0;
-bool		includewal = false;
-bool		streamwal = false;
-bool		fastcheckpoint = false;
-bool		writerecoveryconf = false;
-int			standby_message_timeout = 10 * 1000;		/* 10 sec = default */
+static char	format = 'p';		/* p(lain)/t(ar) */
+static char *label = "pg_basebackup base backup";
+static bool	showprogress = false;
+static int verbose = 0;
+static int	compresslevel = 0;
+static bool	includewal = false;
+static bool	streamwal = false;
+static bool	fastcheckpoint = false;
+static bool	writerecoveryconf = false;
+static int	standby_message_timeout = 10 * 1000;		/* 10 sec = default */
 
 /* Progress counters */
 static uint64 totalsize;
diff --git a/src/bin/pg_basebackup/pg_receivexlog.c b/src/bin/pg_basebackup/pg_receivexlog.c
@@ -32,11 +32,11 @@
 #define RECONNECT_SLEEP_TIME 5
 
 /* Global options */
-char	   *basedir = NULL;
-int			verbose = 0;
-int			noloop = 0;
-int			standby_message_timeout = 10 * 1000;		/* 10 sec = default */
-volatile bool time_to_abort = false;
+static char *basedir = NULL;
+static int	verbose = 0;
+static int	noloop = 0;
+static int	standby_message_timeout = 10 * 1000;		/* 10 sec = default */
+static volatile bool time_to_abort = false;
 
 
 static void usage(void);
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
@@ -90,11 +90,11 @@ bool		g_verbose;			/* User wants verbose narration of our
 								 * activities. */
 
 /* various user-settable parameters */
-bool		schemaOnly;
-bool		dataOnly;
-int			dumpSections;		/* bitmask of chosen sections */
-bool		aclsSkip;
-const char *lockWaitTimeout;
+static bool	schemaOnly;
+static bool	dataOnly;
+static int	dumpSections;		/* bitmask of chosen sections */
+static bool	aclsSkip;
+static const char *lockWaitTimeout;
 
 /* subquery used to convert user ID (eg, datdba) to user name */
 static const char *username_subquery;

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,8 @@`
`20`	`20`	`#include "utils/datum.h"`
`21`	`21`	`#include "utils/memutils.h"`
`22`	`22`
	`23`	`+/* GUC parameter */`
	`24`	`+int GinFuzzySearchLimit = 0;`
`23`	`25`
`24`	`26`	`typedef struct pendingPosition`
`25`	`27`	`{`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@`
`33`	`33`	`static HTAB *RelfilenodeMapHash = NULL;`
`34`	`34`
`35`	`35`	`/* built first time through in InitializeRelfilenodeMap */`
`36`		`-ScanKeyData relfilenode_skey[2];`
	`36`	`+static ScanKeyData relfilenode_skey[2];`
`37`	`37`
`38`	`38`	`typedef struct`
`39`	`39`	`{`