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

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

diff --git a/src/graph.c b/src/graph.c
index 832e01754a143274eb449d8f58068d3e3e133190..3529d011ef333aa90cabf06750b4ea52174c58c2 100644 (file)
--- a/src/graph.c
+++ b/src/graph.c
@@ -274,9 +274,9 @@ static void sssp_bfs(void) {
                                n->mtuevent = NULL;
                        }
 
                                n->mtuevent = NULL;
                        }
 

-                       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], "NODE=%s", n->name);
                        sockaddr2str(&n->address, &address, &port);
                        xasprintf(&envp[4], "REMOTEADDRESS=%s", address);
                        xasprintf(&envp[3], "NODE=%s", n->name);
                        sockaddr2str(&n->address, &address, &port);
                        xasprintf(&envp[4], "REMOTEADDRESS=%s", address);