Fix incorrect format qualifiers.

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.

diff --git a/src/multicast_device.c b/src/multicast_device.c
index de3ff15..4d5f10a 100644 (file)
--- a/src/multicast_device.c
+++ b/src/multicast_device.c
@@ -129,7 +129,7 @@ static bool setup_device(void) {
 #endif
 
                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;
        }
 

diff --git a/src/route.c b/src/route.c
index 43d2697..8c65c4c 100644 (file)
--- a/src/route.c
+++ b/src/route.c
@@ -223,7 +223,7 @@ static void learn_mac(mac_t *address) {
        /* If we don't know this MAC address yet, store it */
 
        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[4], address->x[5]);
 

diff --git a/src/subnet_parse.c b/src/subnet_parse.c
index 5b0b482..1d54c13 100644 (file)
--- a/src/subnet_parse.c
+++ b/src/subnet_parse.c
@@ -255,7 +255,7 @@ bool str2net(subnet_t *subnet, const char *subnetstr) {
                for (int i = 0; i < 4; i++)
                        if (x[i] > 255)
                                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, "::");
@@ -314,7 +314,7 @@ bool net2str(char *netstr, int len, const subnet_t *subnet) {
        int prefixlength = -1;
        switch (subnet->type) {
                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[1],
                                         subnet->net.mac.address.x[2],
@@ -326,7 +326,7 @@ bool net2str(char *netstr, int len, const subnet_t *subnet) {
                        break;
 
                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[1],
                                         subnet->net.ipv4.address.x[2],