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

[tinc] / src / node.c

diff --git a/src/node.c b/src/node.c
index 4ec5d35..b5e033c 100644 (file)
--- a/src/node.c
+++ b/src/node.c
@@ -152,7 +152,7 @@ void node_del(node_t *n) {
 }
 
 node_t *lookup_node(char *name) {
-       node_t n = {NULL};
+       node_t n = {0};
 
        n.name = name;
 
@@ -213,14 +213,14 @@ bool dump_nodes(connection_t *c) {
 
                id[sizeof(id) - 1] = 0;
                send_request(c, "%d %d %s %s %s %d %d %d %d %x %x %s %s %d %d %d %d %ld %d %"PRIu64" %"PRIu64" %"PRIu64" %"PRIu64, CONTROL, REQ_DUMP_NODES,
-                            n->name, id, n->hostname ? : "unknown port unknown",
+                            n->name, id, n->hostname ? n->hostname : "unknown port unknown",
 #ifdef DISABLE_LEGACY
                             0, 0, 0,
 #else
                             cipher_get_nid(n->outcipher), digest_get_nid(n->outdigest), (int)digest_length(n->outdigest),
 #endif
                             n->outcompression, n->options, bitfield_to_int(&n->status, sizeof(n->status)),
-                            n->nexthop ? n->nexthop->name : "-", n->via ? n->via->name ? : "-" : "-", n->distance,
+                            n->nexthop ? n->nexthop->name : "-", n->via && n->via->name ? n->via->name : "-", n->distance,
                             n->mtu, n->minmtu, n->maxmtu, (long)n->last_state_change, n->udp_ping_rtt,
                             n->in_packets, n->in_bytes, n->out_packets, n->out_bytes);
        }