Sync from head

ggatec/ggatec.c

@@ -55,7 +55,7 @@
 #include "ggate.h"
 
 
-enum { UNSET, CREATE, DESTROY, LIST, RESCUE } action = UNSET;
+static enum { UNSET, CREATE, DESTROY, LIST, RESCUE } action = UNSET;
 
 static const char *path = NULL;
 static const char *host = NULL;

ggated/ggated.c

@@ -92,12 +92,12 @@ struct ggd_export {
 
 static const char *exports_file = GGATED_EXPORT_FILE;
 static int got_sighup = 0;
-in_addr_t bindaddr;
+static in_addr_t bindaddr;
 
 static TAILQ_HEAD(, ggd_request) inqueue = TAILQ_HEAD_INITIALIZER(inqueue);
 static TAILQ_HEAD(, ggd_request) outqueue = TAILQ_HEAD_INITIALIZER(outqueue);
-pthread_mutex_t inqueue_mtx, outqueue_mtx;
-pthread_cond_t inqueue_cond, outqueue_cond;
+static pthread_mutex_t inqueue_mtx, outqueue_mtx;
+static pthread_cond_t inqueue_cond, outqueue_cond;
 
 static SLIST_HEAD(, ggd_export) exports = SLIST_HEAD_INITIALIZER(exports);
 static LIST_HEAD(, ggd_connection) connections = LIST_HEAD_INITIALIZER(connections);

ggatel/ggatel.c

@@ -47,7 +47,7 @@
 #include "ggate.h"
 
 
-enum { UNSET, CREATE, DESTROY, LIST, RESCUE } action = UNSET;
+static enum { UNSET, CREATE, DESTROY, LIST, RESCUE } action = UNSET;
 
 static const char *path = NULL;
 static int unit = G_GATE_UNIT_AUTO;

shared/ggate.h

@@ -95,8 +95,8 @@ struct g_gate_hdr {
 
 void	g_gate_vlog(int priority, const char *message, va_list ap);
 void	g_gate_log(int priority, const char *message, ...);
-void	g_gate_xvlog(const char *message, va_list ap);
-void	g_gate_xlog(const char *message, ...);
+void	g_gate_xvlog(const char *message, va_list ap) __dead2;
+void	g_gate_xlog(const char *message, ...) __dead2;
 off_t	g_gate_mediasize(int fd);
 unsigned g_gate_sectorsize(int fd);
 void	g_gate_open_device(void);