j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Use %x instead of %lx where appropriate.

Browse source 
Some conversions were not properly merged from the master branch.
This commit is contained in:
Guus Sliepen 2009-11-04 16:19:08 +01:00
parent 37ccb325af
commit c4afc48154
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/connection.c
View file

@ -98,7 +98,7 @@ int dump_connections(struct evbuffer *out) {
for(node = connection_tree->head; node; node = node->next) { for(node = connection_tree->head; node; node = node->next) {
c = node->data; c = node->data;
if(evbuffer_add_printf(out, 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, c->name, c->hostname, c->options, c->socket,
bitfield_to_int(&c->status, sizeof c->status)) == -1) bitfield_to_int(&c->status, sizeof c->status)) == -1)
return errno; return errno;

2
src/edge.c
View file

@ -117,7 +117,7 @@ int dump_edges(struct evbuffer *out) {
e = node2->data; e = node2->data;
address = sockaddr2hostname(&e->address); address = sockaddr2hostname(&e->address);
if(evbuffer_add_printf(out, 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->from->name, e->to->name, address,
e->options, e->weight) == -1) { e->options, e->weight) == -1) {
free(address); free(address);

2
src/node.c
View file

@ -160,7 +160,7 @@ int dump_nodes(struct evbuffer *out) {
for(node = node_tree->head; node; node = node->next) { for(node = node_tree->head; node; node = node->next) {
n = node->data; 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), n->name, n->hostname, cipher_get_nid(&n->outcipher),
digest_get_nid(&n->outdigest), digest_length(&n->outdigest), n->outcompression, 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 : "-", n->options, bitfield_to_int(&n->status, sizeof n->status), n->nexthop ? n->nexthop->name : "-",