daemon/network: avoid unused functions and variables

Make sure gcc doesn't produce unused func/var warnings when using
optional compilation. This fixes three such issues on CentOS 7.

diff --git a/daemon/network.c b/daemon/network.c
index 5a47ad8038a70a078872a27bb31811844212f1a4..22273f034c6b0cf862cab38122077754439e3528 100644 (file)
--- a/daemon/network.c
+++ b/daemon/network.c
@@ -250,7 +250,7 @@ int network_listen_fd(struct network *net, int fd, bool use_tls)
        /* Extract local address and socket type. */
        int sock_type = SOCK_DGRAM;
        socklen_t len = sizeof(sock_type);
-       int ret = getsockopt(fd, SOL_SOCKET, SO_TYPE, &sock_type, &len);        
+       int ret = getsockopt(fd, SOL_SOCKET, SO_TYPE, &sock_type, &len);
        if (ret != 0) {
                return kr_error(EBADF);
        }
@@ -364,9 +364,9 @@ void network_new_hostname(struct network *net, struct engine *engine)
        }
 }
 
+#ifdef SO_ATTACH_BPF
 static int set_bpf_cb(const char *key, void *val, void *ext)
 {
-#ifdef SO_ATTACH_BPF
        endpoint_array_t *endpoints = (endpoint_array_t *)val;
        assert(endpoints != NULL);
        int *bpffd = (int *)ext;
@@ -383,13 +383,9 @@ static int set_bpf_cb(const char *key, void *val, void *ext)
                        return 1; /* return error (and stop iterating over net->endpoints) */
                }
        }
-#else
-       kr_log_error("[network] SO_ATTACH_BPF socket option doesn't supported\n");
-       (void)key; (void)val; (void)ext;
-       return 1;
-#endif
        return 0; /* OK */
 }
+#endif
 
 int network_set_bpf(struct network *net, int bpf_fd)
 {
@@ -408,9 +404,9 @@ int network_set_bpf(struct network *net, int bpf_fd)
        return 1;
 }
 
+#ifdef SO_DETACH_BPF
 static int clear_bpf_cb(const char *key, void *val, void *ext)
 {
-#ifdef SO_DETACH_BPF
        endpoint_array_t *endpoints = (endpoint_array_t *)val;
        assert(endpoints != NULL);
 
@@ -427,13 +423,9 @@ static int clear_bpf_cb(const char *key, void *val, void *ext)
                /* Proceed even if setsockopt() failed,
                 * as we want to process all opened sockets. */
        }
-#else
-       kr_log_error("[network] SO_DETACH_BPF socket option doesn't supported\n");
-       (void)key; (void)val; (void)ext;
-       return 1;
-#endif
        return 0;
 }
+#endif
 
 void network_clear_bpf(struct network *net)
 {

diff --git a/daemon/tls.c b/daemon/tls.c
index 89a5f02cc43e3e80632104b67e0425bb9e348247..d4a8df98cd33fcaed1d9a356fcaeb345a7cab9ac 100644 (file)
--- a/daemon/tls.c
+++ b/daemon/tls.c
@@ -459,7 +459,7 @@ ssize_t tls_process_input_data(struct session *s, const uint8_t *buf, ssize_t nr
                /* don't risk overflowing the buffer if we have a mistake somewhere */
                return kr_error(EINVAL);
        }
-       
+
        const char *logstring = tls_p->client_side ? client_logstring : server_logstring;
 
        tls_p->buf = buf;
@@ -864,7 +864,7 @@ int tls_client_params_clear(map_t *tls_client_paramlist, const char *addr, uint1
                client_paramlist_entry_clear(NULL, (void *)entry, NULL);
                map_del(tls_client_paramlist, key);
        }
-       
+
        return kr_ok();
 }
 
@@ -1097,6 +1097,7 @@ static int client_verify_certificate(gnutls_session_t tls_session)
                kr_log_error("[tls_client] newer gnutls is required to use PIN check\n");
                return GNUTLS_E_CERTIFICATE_ERROR;
        }
+       goto skip_pins;
 #endif
 
 skip_pins: