aboutsummaryrefslogtreecommitdiff
path: root/src/bin
diff options
context:
space:
mode:
authorHeikki Linnakangas <heikki.linnakangas@iki.fi>2013-12-16 11:27:30 +0200
committerHeikki Linnakangas <heikki.linnakangas@iki.fi>2013-12-16 11:41:17 +0200
commit30b96549ab41ce23399256d4ea9723a05c139558 (patch)
treef54f7f58885fe494a88dacff074a7f847f9a7286 /src/bin
parent1f0626ee40f2decd93ca96c6f9e9a9b5edff57ba (diff)
downloadpostgresql-30b96549ab41ce23399256d4ea9723a05c139558.tar.gz
postgresql-30b96549ab41ce23399256d4ea9723a05c139558.zip
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.
Diffstat (limited to 'src/bin')
-rw-r--r--src/bin/pg_basebackup/pg_basebackup.c22
-rw-r--r--src/bin/pg_basebackup/pg_receivexlog.c10
-rw-r--r--src/bin/pg_dump/pg_dump.c10
3 files changed, 21 insertions, 21 deletions
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;