From: a1346054 <36859588+a1346054@users.noreply.github.com>
Date: Sun, 5 Sep 2021 13:50:56 +0000 (+0000)
Subject: unify codestyle
X-Git-Tag: v0.95~4^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d80fd0f1d383047cf1cb9b57f1223013d6fe85a;p=thirdparty%2Fmtr.git

unify codestyle
---

diff --git a/packet/deconstruct_unix.c b/packet/deconstruct_unix.c
index 1af7419..61c6e91 100644
--- a/packet/deconstruct_unix.c
+++ b/packet/deconstruct_unix.c
@@ -99,22 +99,22 @@ void handle_inner_udp_packet(
     {
         saddr = &((struct IPHeader *)ip)->saddr;
         daddr = &((struct IPHeader *)ip)->daddr;
-    }else
+    } else
     if (af == AF_INET6)
     {
         daddr = &((struct IP6Header *)ip)->daddr;
         saddr = &((struct IP6Header *)ip)->saddr;
-    }else
+    } else
     {
         return;
     }
 
-    if( memcmp(sockaddr_addr_offset(&probe->remote_addr),
+    if ( memcmp(sockaddr_addr_offset(&probe->remote_addr),
                daddr,
                sockaddr_addr_size(&probe->remote_addr)) != 0 )
             return;
 
-    if( memcmp(sockaddr_addr_offset(&probe->local_addr),
+    if ( memcmp(sockaddr_addr_offset(&probe->local_addr),
            saddr,
            sockaddr_addr_size(&probe->local_addr)) != 0)
         return;
diff --git a/packet/sockaddr.c b/packet/sockaddr.c
index 2a4b34a..892d7ee 100644
--- a/packet/sockaddr.c
+++ b/packet/sockaddr.c
@@ -5,14 +5,14 @@
 
 void *sockaddr_addr_offset(const void *x)
 {
-	if( x == NULL )
+	if ( x == NULL )
 		return NULL;
 
-	if( ((struct sockaddr *)(x))->sa_family == AF_INET )
+	if ( ((struct sockaddr *)(x))->sa_family == AF_INET )
 	{
 		return ((void *)(x) + offsetof(struct sockaddr_in, sin_addr));
-	}else
-	if( ((struct sockaddr *)(x))->sa_family == AF_INET6 )
+	} else
+	if ( ((struct sockaddr *)(x))->sa_family == AF_INET6 )
 	{
 		return ((void *)(x) + offsetof(struct sockaddr_in6, sin6_addr));
 	}
@@ -22,13 +22,13 @@ void *sockaddr_addr_offset(const void *x)
 
 unsigned int sockaddr_addr_size(const void *x)
 {
-	if( x == NULL )
+	if ( x == NULL )
 		return 0;
-	if( ((struct sockaddr *)(x))->sa_family == AF_INET )
+	if ( ((struct sockaddr *)(x))->sa_family == AF_INET )
 	{
 		return sizeof(struct in_addr);
-	}else
-	if( ((struct sockaddr *)(x))->sa_family == AF_INET6 )
+	} else
+	if ( ((struct sockaddr *)(x))->sa_family == AF_INET6 )
 	{
 		return sizeof(struct in6_addr);
 	}
@@ -38,13 +38,13 @@ unsigned int sockaddr_addr_size(const void *x)
 
 unsigned int sockaddr_size(const void *x)
 {
-	if( x == NULL )
+	if ( x == NULL )
 		return 0;
-	if( ((struct sockaddr *)(x))->sa_family == AF_INET )
+	if ( ((struct sockaddr *)(x))->sa_family == AF_INET )
 	{
 		return sizeof(struct sockaddr_in);
-	}else
-	if( ((struct sockaddr *)(x))->sa_family == AF_INET6 )
+	} else
+	if ( ((struct sockaddr *)(x))->sa_family == AF_INET6 )
 	{
 		return sizeof(struct sockaddr_in6);
 	}
@@ -53,14 +53,14 @@ unsigned int sockaddr_size(const void *x)
 
 in_port_t *sockaddr_port_offset(const void *x)
 {
-	if( x == NULL )
+	if ( x == NULL )
 		return NULL;
 
-	if( ((struct sockaddr *)(x))->sa_family == AF_INET )
+	if ( ((struct sockaddr *)(x))->sa_family == AF_INET )
 	{
 		return ((void *)(x) + offsetof(struct sockaddr_in, sin_port));
-	}else
-	if( ((struct sockaddr *)(x))->sa_family == AF_INET6 )
+	} else
+	if ( ((struct sockaddr *)(x))->sa_family == AF_INET6 )
 	{
 		return ((void *)(x) + offsetof(struct sockaddr_in6, sin6_port));
 	}
diff --git a/portability/queue.h b/portability/queue.h
index d19a425..e1222db 100644
--- a/portability/queue.h
+++ b/portability/queue.h
@@ -305,7 +305,7 @@ struct {								\
 #define	STAILQ_FIRST(head)	((head)->stqh_first)
 
 #define	STAILQ_FOREACH(var, head, field)				\
-	for((var) = STAILQ_FIRST((head));				\
+	for ((var) = STAILQ_FIRST((head));				\
 	   (var);							\
 	   (var) = STAILQ_NEXT((var), field))
 
diff --git a/ui/net.c b/ui/net.c
index 1df3503..23d5814 100644
--- a/ui/net.c
+++ b/ui/net.c
@@ -600,7 +600,7 @@ int net_send_batch(
         numhosts = batch_at + 1;
     }
 
-    if(restart) {
+    if (restart) {
         batch_at = ctl->fstTTL - 1;
         return 1;
     }
diff --git a/ui/report.c b/ui/report.c
index c540717..6f381f5 100644
--- a/ui/report.c
+++ b/ui/report.c
@@ -344,7 +344,7 @@ void json_close(struct mtr_ctl *ctl)
             goto on_error;
 
 #ifdef HAVE_IPINFO
-        if(!ctl->ipinfo_no) {
+        if (!ctl->ipinfo_no) {
             char* fmtinfo = fmt_ipinfo(ctl, addr);
             if (fmtinfo != NULL)
                 fmtinfo = trim(fmtinfo, '\0');