From 30b96549ab41ce23399256d4ea9723a05c139558 Mon Sep 17 00:00:00 2001
From: Heikki Linnakangas <heikki.linnakangas@iki.fi>
Date: Mon, 16 Dec 2013 11:27:30 +0200
Subject: [PATCH] Mark variables 'static' where possible. Move
GinFuzzySearchLimit to ginget.c
Per "clang -Wmissing-variable-declarations" output, posted by Andres Freund.
I didn't silence all those warnings, though, only the most obvious cases.
---
src/backend/access/gin/ginget.c | 2 ++
src/backend/storage/lmgr/lock.c | 2 +-
src/backend/utils/cache/relfilenodemap.c | 2 +-
src/backend/utils/init/globals.c | 2 --
src/bin/pg_basebackup/pg_basebackup.c | 22 +++++++++++-----------
src/bin/pg_basebackup/pg_receivexlog.c | 10 +++++-----
src/bin/pg_dump/pg_dump.c | 10 +++++-----
7 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/src/backend/access/gin/ginget.c b/src/backend/access/gin/ginget.c
index f2ee2fb9666..2e3e86f9d35 100644
--- 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
index e4c9fa4ab42..536be441890 100644
--- 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
index 1469bfaba2f..6806fbb073b 100644
--- 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
index e76704f3153..dd1309be057 100644
--- 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
index 6706c0c7a90..d16067f2242 100644
--- 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
index 252a7e08d67..3de51ef461d 100644
--- 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
index 224e8cbe086..837e7844312 100644
--- 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;
--
GitLab