From af2e0c9a32642065aedd2e67ca1f5791ca7a407d Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Thu, 2 Jun 2011 17:57:53 +0200 Subject: [PATCH] Remove unused functions and variables. --- src/net_socket.c | 6 ------ src/process.c | 7 +------ src/tincctl.c | 6 ------ 3 files changed, 1 insertion(+), 18 deletions(-) diff --git a/src/net_socket.c b/src/net_socket.c index 97a80584..80f37a45 100644 --- 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 3b147909..19c39801 100644 --- 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 20fc991f..6d7f03b8 100644 --- 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 */ -- 2.20.1