Convert sizeof foo to sizeof(foo).

[meshlink] / src / netutl.c

diff --git a/src/netutl.c b/src/netutl.c
index 11987afdaec917910f304f2e5c9059ef438d2d80..983ad91485de40a5a6692a8c1613b16452a76e50 100644 (file)
--- a/src/netutl.c
+++ b/src/netutl.c
@@ -87,7 +87,7 @@ void sockaddr2str(const sockaddr_t *sa, char **addrstr, char **portstr) {
                return;
        }
 
-       err = getnameinfo(&sa->sa, SALEN(sa->sa), address, sizeof address, port, sizeof port, NI_NUMERICHOST | NI_NUMERICSERV);
+       err = getnameinfo(&sa->sa, SALEN(sa->sa), address, sizeof(address), port, sizeof(port), NI_NUMERICHOST | NI_NUMERICSERV);
 
        if(err) {
                logger(NULL, MESHLINK_ERROR, "Error while translating addresses: %s", err == EAI_SYSTEM ? strerror(errno) : gai_strerror(err));
@@ -116,11 +116,10 @@ char *sockaddr2hostname(const sockaddr_t *sa) {
                return str;
        }
 
-       err = getnameinfo(&sa->sa, SALEN(sa->sa), address, sizeof address, port, sizeof port,
-                                       hostnames ? 0 : (NI_NUMERICHOST | NI_NUMERICSERV));
-       if(err) {
+       err = getnameinfo(&sa->sa, SALEN(sa->sa), address, sizeof(address), port, sizeof(port),
+                         hostnames ? 0 : (NI_NUMERICHOST | NI_NUMERICSERV));
+       if(err)
                logger(NULL, MESHLINK_ERROR, "Error while looking up hostname: %s", err == EAI_SYSTEM ? strerror(errno) : gai_strerror(err));
-       }
 
        xasprintf(&str, "%s port %s", address, port);
 
@@ -135,23 +134,23 @@ int sockaddrcmp_noport(const sockaddr_t *a, const sockaddr_t *b) {
        if(result)
                return result;
 
-       switch (a->sa.sa_family) {
-               case AF_UNSPEC:
-                       return 0;
+       switch(a->sa.sa_family) {
+       case AF_UNSPEC:
+               return 0;
 
-               case AF_UNKNOWN:
-                       return strcmp(a->unknown.address, b->unknown.address);
+       case AF_UNKNOWN:
+               return strcmp(a->unknown.address, b->unknown.address);
 
-               case AF_INET:
-                       return memcmp(&a->in.sin_addr, &b->in.sin_addr, sizeof(a->in.sin_addr));
+       case AF_INET:
+               return memcmp(&a->in.sin_addr, &b->in.sin_addr, sizeof(a->in.sin_addr));
 
-               case AF_INET6:
-                       return memcmp(&a->in6.sin6_addr, &b->in6.sin6_addr, sizeof(a->in6.sin6_addr));
+       case AF_INET6:
+               return memcmp(&a->in6.sin6_addr, &b->in6.sin6_addr, sizeof(a->in6.sin6_addr));
 
-               default:
-                       logger(NULL, MESHLINK_ERROR, "sockaddrcmp() was called with unknown address family %d, exitting!",
-                                  a->sa.sa_family);
-                       abort();
+       default:
+               logger(NULL, MESHLINK_ERROR, "sockaddrcmp() was called with unknown address family %d, exitting!",
+                      a->sa.sa_family);
+               abort();
        }
 }
 
@@ -163,45 +162,45 @@ int sockaddrcmp(const sockaddr_t *a, const sockaddr_t *b) {
        if(result)
                return result;
 
-       switch (a->sa.sa_family) {
-               case AF_UNSPEC:
-                       return 0;
+       switch(a->sa.sa_family) {
+       case AF_UNSPEC:
+               return 0;
 
-               case AF_UNKNOWN:
-                       result = strcmp(a->unknown.address, b->unknown.address);
+       case AF_UNKNOWN:
+               result = strcmp(a->unknown.address, b->unknown.address);
 
-                       if(result)
-                               return result;
+               if(result)
+                       return result;
 
-                       return strcmp(a->unknown.port, b->unknown.port);
+               return strcmp(a->unknown.port, b->unknown.port);
 
-               case AF_INET:
-                       result = memcmp(&a->in.sin_addr, &b->in.sin_addr, sizeof a->in.sin_addr);
+       case AF_INET:
+               result = memcmp(&a->in.sin_addr, &b->in.sin_addr, sizeof(a)->in.sin_addr);
 
-                       if(result)
-                               return result;
+               if(result)
+                       return result;
 
-                       return memcmp(&a->in.sin_port, &b->in.sin_port, sizeof a->in.sin_port);
+               return memcmp(&a->in.sin_port, &b->in.sin_port, sizeof(a)->in.sin_port);
 
-               case AF_INET6:
-                       result = memcmp(&a->in6.sin6_addr, &b->in6.sin6_addr, sizeof a->in6.sin6_addr);
+       case AF_INET6:
+               result = memcmp(&a->in6.sin6_addr, &b->in6.sin6_addr, sizeof(a)->in6.sin6_addr);
 
-                       if(result)
-                               return result;
+               if(result)
+                       return result;
 
-                       return memcmp(&a->in6.sin6_port, &b->in6.sin6_port, sizeof a->in6.sin6_port);
+               return memcmp(&a->in6.sin6_port, &b->in6.sin6_port, sizeof(a)->in6.sin6_port);
 
-               default:
-                       logger(NULL, MESHLINK_ERROR, "sockaddrcmp() was called with unknown address family %d, exitting!",
-                                  a->sa.sa_family);
-                       abort();
+       default:
+               logger(NULL, MESHLINK_ERROR, "sockaddrcmp() was called with unknown address family %d, exitting!",
+                      a->sa.sa_family);
+               abort();
        }
 }
 
 void sockaddrcpy(sockaddr_t *a, const sockaddr_t *b) {
-       if(b->sa.sa_family != AF_UNKNOWN) {
+       if(b->sa.sa_family != AF_UNKNOWN)
                *a = *b;
-       } else {
+       else {
                a->unknown.family = AF_UNKNOWN;
                a->unknown.address = xstrdup(b->unknown.address);
                a->unknown.port = xstrdup(b->unknown.port);