Remove unused functions and variables.

diff --git a/src/net_socket.c b/src/net_socket.c
index 97a80584769d7773c97c58c3ab319fe2387c1443..80f37a455d53abfcd9efa77b0e73adafeedba2ff 100644 (file)
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -466,12 +466,6 @@ static void handle_meta_write(int sock, short events, void *data) {
                event_del(&c->outevent);
 }
 
-static void handle_meta_connection_error(struct bufferevent *event, short what, void *data) {
-       connection_t *c = data;
-       logger(LOG_ERR, "handle_meta_connection_error() called: %d: %s", what, strerror(errno));
-       terminate_connection(c, c->status.active);
-}
-
 void setup_outgoing_connection(outgoing_t *outgoing) {
        connection_t *c;
        node_t *n;

diff --git a/src/process.c b/src/process.c
index 3b147909b8067ddc5dd5e514b24e7cd93ffab43e..19c39801c3bbdbdbb3dd73e265349aa5f6181177 100644 (file)
--- a/src/process.c
+++ b/src/process.c
@@ -40,11 +40,6 @@ extern char *identname;
 extern char **g_argv;
 extern bool use_logfile;
 
-static void memory_full(int size) {
-       logger(LOG_ERR, "Memory exhausted (couldn't allocate %d bytes), exitting.", size);
-       exit(1);
-}
-
 /* Some functions the less gifted operating systems might lack... */
 
 #ifdef HAVE_MINGW
@@ -353,7 +348,7 @@ static struct {
 void setup_signals(void) {
 #ifndef HAVE_MINGW
        int i;
-       struct sigaction act = {NULL};
+       struct sigaction act = {{NULL}};
 
        sigemptyset(&act.sa_mask);
 

diff --git a/src/tincctl.c b/src/tincctl.c
index 20fc991fd88899570ad16218069f228598586d83..6d7f03b877e0be11a69e81093c46b4bfa060616a 100644 (file)
--- a/src/tincctl.c
+++ b/src/tincctl.c
@@ -38,12 +38,6 @@ static bool show_help = false;
 /* If nonzero, print the version on standard output and exit.  */
 static bool show_version = false;
 
-/* If nonzero, it will attempt to kill a running tincd and exit. */
-static int kill_tincd = 0;
-
-/* If nonzero, generate public/private keypair for this host/net. */
-static int generate_keys = 0;
-
 static char *name = NULL;
 static char *identname = NULL;                         /* program name for syslog */
 static char *controlcookiename = NULL;                 /* cookie file location */