prefork: Make socket finding etc. stuff static

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/cprogs/prefork.c b/cprogs/prefork.c
index 095dd44e89d2778c5241568e1cd5bfff0f565cc8..437923f88c3dbeb2ae0e49f4552eaf0e57015adc 100644 (file)
--- a/cprogs/prefork.c
+++ b/cprogs/prefork.c
@@ -2,14 +2,13 @@
 
 #include "prefork.h"
 
-const char *interp, *ident;
-
+const char *interp, *ident, *script, *socket_path, *lock_path;
+bool logging;
 struct sha256_ctx identsc;
 
-uid_t us;
-const char *run_base, *script, *socket_path, *lock_path;
-const char *run_base_mkdir_p;
-bool logging;
+static uid_t us;
+static const char *run_base;
+static const char *run_base_mkdir_p;
 
 void common_diee(const char *m) { diee("%s", m); }
 void common_die (const char *m) { die ("%s", m); }

diff --git a/cprogs/prefork.h b/cprogs/prefork.h
index 1d69afcf01e1146080b63a0e0c57f37a67e8169a..19c3bc1da4eb0da470665ea5bbb27ed0650c1cf4 100644 (file)
--- a/cprogs/prefork.h
+++ b/cprogs/prefork.h
@@ -34,17 +34,12 @@
 
 #define MINHEXHASH 33
 
-extern const char *interp, *ident;
-
+extern const char *interp, *ident, *script, *socket_path, *lock_path;
+extern bool logging;
 extern struct sha256_ctx identsc;
 
 extern const char our_name[];
 
-extern uid_t us;
-extern const char *run_base, *script, *socket_path, *lock_path;
-extern const char *run_base_mkdir_p;
-extern bool logging;
-
 bool find_run_base_var_run(void);
 void find_socket_path(void);