Convert sizeof foo to sizeof(foo).

[tinc] / src / subnet_parse.c

diff --git a/src/subnet_parse.c b/src/subnet_parse.c
index c919b59..ca17dce 100644 (file)
--- a/src/subnet_parse.c
+++ b/src/subnet_parse.c
@@ -103,7 +103,7 @@ bool maskcheck(const void *va, int masklen, int len) {
 static int subnet_compare_mac(const subnet_t *a, const subnet_t *b) {
        int result;
 
-       result = memcmp(&a->net.mac.address, &b->net.mac.address, sizeof a->net.mac.address);
+       result = memcmp(&a->net.mac.address, &b->net.mac.address, sizeof(a->net.mac.address));
 
        if(result)
                return result;
@@ -186,7 +186,7 @@ int subnet_compare(const subnet_t *a, const subnet_t *b) {
 bool str2net(subnet_t *subnet, const char *subnetstr) {
        char str[1024];
        strncpy(str, subnetstr, sizeof(str));
-       str[sizeof str - 1] = 0;
+       str[sizeof(str) - 1] = 0;
        int consumed;
 
        int weight = DEFAULT_WEIGHT;
@@ -256,7 +256,7 @@ bool str2net(subnet_t *subnet, const char *subnetstr) {
                for (int i = 0; i < 4; i++)
                        if (x[i] > 255)
                                return false;
-               snprintf(last_colon, sizeof str - (last_colon - str), ":%02x%02x:%02x%02x", x[0], x[1], x[2], x[3]);
+               snprintf(last_colon, sizeof(str) - (last_colon - str), ":%02x%02x:%02x%02x", x[0], x[1], x[2], x[3]);
        }
 
        char* double_colon = strstr(str, "::");
@@ -372,7 +372,7 @@ bool net2str(char *netstr, int len, const subnet_t *subnet) {
                                        result = snprintf(netstr, len, *format, ":::");
                                        i += max_zero_length;
                                } else {
-                                       result = snprintf(netstr, len, "%hx:", ntohs(subnet->net.ipv6.address.x[i]));
+                                       result = snprintf(netstr, len, "%x:", ntohs(subnet->net.ipv6.address.x[i]));
                                        i++;
                                }
                                netstr += result;
@@ -401,11 +401,8 @@ bool net2str(char *netstr, int len, const subnet_t *subnet) {
                len -= result;
        }
 
-       if (subnet->weight != DEFAULT_WEIGHT) {
+       if (subnet->weight != DEFAULT_WEIGHT)
                snprintf(netstr, len, "#%d", subnet->weight);
-               netstr += result;
-               len -= result;
-       }
 
        return true;
 }