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

Fix incorrect format qualifiers.

Browse source 
Based on a patch from Etienne Dechamps. We avoid the use of %hhx, since even
though it is C99, not all compilers support it yet. We use %x instead, since
it's guaranteed that the minimum size of function arguments on the stack or in
registers is that of an int.
This commit is contained in:
Guus Sliepen 2014-07-10 22:41:01 +02:00
parent d8ed5cf36d
commit 45a30f7157
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/multicast_device.c
View file

@ -129,7 +129,7 @@ static bool setup_device(void) {
#endif #endif
default: default:
logger(DEBUG_ALWAYS, LOG_ERR, "Multicast for address family %hx unsupported", ai->ai_family); logger(DEBUG_ALWAYS, LOG_ERR, "Multicast for address family %x unsupported", ai->ai_family);
goto error; goto error;
} }

2
src/route.c
View file

@ -223,7 +223,7 @@ static void learn_mac(mac_t *address) {
/* If we don't know this MAC address yet, store it */ /* If we don't know this MAC address yet, store it */
if(!subnet) { if(!subnet) {
logger(DEBUG_TRAFFIC, LOG_INFO, "Learned new MAC address %hx:%hx:%hx:%hx:%hx:%hx", logger(DEBUG_TRAFFIC, LOG_INFO, "Learned new MAC address %x:%x:%x:%x:%x:%x",
address->x[0], address->x[1], address->x[2], address->x[3], address->x[0], address->x[1], address->x[2], address->x[3],
address->x[4], address->x[5]); address->x[4], address->x[5]);

6
src/subnet_parse.c
View file

@ -255,7 +255,7 @@ bool str2net(subnet_t *subnet, const char *subnetstr) {
for (int i = 0; i < 4; i++) for (int i = 0; i < 4; i++)
if (x[i] > 255) if (x[i] > 255)
return false; return false;
sprintf(last_colon, ":%02hx%02hx:%02hx%02hx", x[0], x[1], x[2], x[3]); sprintf(last_colon, ":%02x%02x:%02x%02x", x[0], x[1], x[2], x[3]);
} }
char* double_colon = strstr(str, "::"); char* double_colon = strstr(str, "::");
@ -314,7 +314,7 @@ bool net2str(char *netstr, int len, const subnet_t *subnet) {
int prefixlength = -1; int prefixlength = -1;
switch (subnet->type) { switch (subnet->type) {
case SUBNET_MAC: case SUBNET_MAC:
result = snprintf(netstr, len, "%02hx:%02hx:%02hx:%02hx:%02hx:%02hx", result = snprintf(netstr, len, "%02x:%02x:%02x:%02x:%02x:%02x",
subnet->net.mac.address.x[0], subnet->net.mac.address.x[0],
subnet->net.mac.address.x[1], subnet->net.mac.address.x[1],
subnet->net.mac.address.x[2], subnet->net.mac.address.x[2],
@ -326,7 +326,7 @@ bool net2str(char *netstr, int len, const subnet_t *subnet) {
break; break;
case SUBNET_IPV4: case SUBNET_IPV4:
result = snprintf(netstr, len, "%hu.%hu.%hu.%hu", result = snprintf(netstr, len, "%u.%u.%u.%u",
subnet->net.ipv4.address.x[0], subnet->net.ipv4.address.x[0],
subnet->net.ipv4.address.x[1], subnet->net.ipv4.address.x[1],
subnet->net.ipv4.address.x[2], subnet->net.ipv4.address.x[2],