Fix all warnings when compiling with -Wall -W -pedantic.

[oweals/tinc.git] / src / net_setup.c

diff --git a/src/net_setup.c b/src/net_setup.c
index 5eddb1a76c3f2d7d04152cd72a4716e720cc9491..8c43b3960902d99c58db7e6421f3ea0de79e8141 100644 (file)
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -388,8 +388,8 @@ static bool setup_myself(void) {
        char *address = NULL;
        char *proxy = NULL;
        char *space;
-       char *envp[5] = {};
-       struct addrinfo *ai, *aip, hint = {};
+       char *envp[5] = {0};
+       struct addrinfo *ai, *aip, hint = {0};
        bool choice;
        int i, err;
        int replaywin_int;
@@ -852,9 +852,9 @@ static bool setup_myself(void) {
        }
 
        /* Run tinc-up script to further initialize the tap interface */
-       xasprintf(&envp[0], "NETNAME=%s", netname ? : "");
-       xasprintf(&envp[1], "DEVICE=%s", device ? : "");
-       xasprintf(&envp[2], "INTERFACE=%s", iface ? : "");
+       xasprintf(&envp[0], "NETNAME=%s", netname ? netname : "");
+       xasprintf(&envp[1], "DEVICE=%s", device ? device : "");
+       xasprintf(&envp[2], "INTERFACE=%s", iface ? iface : "");
        xasprintf(&envp[3], "NAME=%s", myself->name);
 
 #ifdef HAVE_MINGW
@@ -1068,7 +1068,7 @@ bool setup_network(void) {
 void close_network_connections(void) {
        avl_node_t *node, *next;
        connection_t *c;
-       char *envp[5] = {};
+       char *envp[5] = {0};
        int i;
 
        for(node = connection_tree->head; node; node = next) {
@@ -1099,9 +1099,9 @@ void close_network_connections(void) {
                close(listen_socket[i].udp);
        }
 
-       xasprintf(&envp[0], "NETNAME=%s", netname ? : "");
-       xasprintf(&envp[1], "DEVICE=%s", device ? : "");
-       xasprintf(&envp[2], "INTERFACE=%s", iface ? : "");
+       xasprintf(&envp[0], "NETNAME=%s", netname ? netname : "");
+       xasprintf(&envp[1], "DEVICE=%s", device ? device : "");
+       xasprintf(&envp[2], "INTERFACE=%s", iface ? iface : "");
        xasprintf(&envp[3], "NAME=%s", myself->name);
 
        exit_requests();