Use %x instead of %lx where appropriate.

Some conversions were not properly merged from the master branch.

diff --git a/src/connection.c b/src/connection.c
index ce4c753..2372890 100644 (file)
--- a/src/connection.c
+++ b/src/connection.c
@@ -98,7 +98,7 @@ int dump_connections(struct evbuffer *out) {
        for(node = connection_tree->head; node; node = node->next) {
                c = node->data;
                if(evbuffer_add_printf(out,
-                                  " %s at %s options %lx socket %d status %04x\n",
+                                  " %s at %s options %x socket %d status %04x\n",
                                   c->name, c->hostname, c->options, c->socket,
                                   bitfield_to_int(&c->status, sizeof c->status)) == -1)
                        return errno;

diff --git a/src/edge.c b/src/edge.c
index 4d674f3..80bdddb 100644 (file)
--- a/src/edge.c
+++ b/src/edge.c
@@ -117,7 +117,7 @@ int dump_edges(struct evbuffer *out) {
                        e = node2->data;
                        address = sockaddr2hostname(&e->address);
                        if(evbuffer_add_printf(out,
-                                                                  " %s to %s at %s options %lx weight %d\n",
+                                                                  " %s to %s at %s options %x weight %d\n",
                                                                   e->from->name, e->to->name, address,
                                                                   e->options, e->weight) == -1) {
                                free(address);

diff --git a/src/node.c b/src/node.c
index 2ef28b5..75f01e3 100644 (file)
--- a/src/node.c
+++ b/src/node.c
@@ -160,7 +160,7 @@ int dump_nodes(struct evbuffer *out) {
 
        for(node = node_tree->head; node; node = node->next) {
                n = node->data;
-               if(evbuffer_add_printf(out, " %s at %s cipher %d digest %d maclength %d compression %d options %lx status %04x nexthop %s via %s distance %d pmtu %d (min %d max %d)\n",
+               if(evbuffer_add_printf(out, " %s at %s cipher %d digest %d maclength %d compression %d options %x status %04x nexthop %s via %s distance %d pmtu %d (min %d max %d)\n",
                           n->name, n->hostname, cipher_get_nid(&n->outcipher),
                           digest_get_nid(&n->outdigest), digest_length(&n->outdigest), n->outcompression,
                           n->options, bitfield_to_int(&n->status, sizeof n->status), n->nexthop ? n->nexthop->name : "-",