1 files changed, 28 insertions, 22 deletions

diff --git a/src/ip4.c b/src/ip4.c
index e77cfb6..c9ab153 100644
--- a/src/ip4.c
+++ b/src/ip4.c
@@ -1,7 +1,7 @@
 #include "fmt.h"
+#include "ip.h"
 #include "scan.h"
 #include "str.h"
-#include "ip.h"
 
 /**
 	@file ip4.c
@@ -18,12 +18,13 @@
  @return int length of address (ok > 0)
  */
 
-unsigned int ip4_fmt(char *s,char ip[4])
+unsigned int ip4_fmt(char *s, char ip[4])
 {
   unsigned int len;
   unsigned int i;
 
   len = 0;
+  // clang-format off
   i = fmt_ulong(s,(unsigned long) (unsigned char) ip[0]); len += i; if (s) s += i;
   if (s) { *s++ = '.'; } ++len;
   i = fmt_ulong(s,(unsigned long) (unsigned char) ip[1]); len += i; if (s) s += i;
@@ -31,6 +32,7 @@ unsigned int ip4_fmt(char *s,char ip[4])
   i = fmt_ulong(s,(unsigned long) (unsigned char) ip[2]); len += i; if (s) s += i;
   if (s) { *s++ = '.'; } ++len;
   i = fmt_ulong(s,(unsigned long) (unsigned char) ip[3]); len += i; if (s) s += i;
+  // clang-format on
   return len;
 }
 
@@ -42,12 +44,13 @@ unsigned int ip4_fmt(char *s,char ip[4])
  @return int length of address (ok > 0)
  */
 
-unsigned int ia4_fmt(char *s,char ip[4])
+unsigned int ia4_fmt(char *s, char ip[4])
 {
   unsigned int i;
   unsigned int len;
 
   len = 0;
+  // clang-format off
   i = fmt_ulong(s,(unsigned long) ip[3]); len += i; if (s) s += i;
   i = fmt_str(s,"."); len += i; if (s) s += i;
   i = fmt_ulong(s,(unsigned long) ip[2]); len += i; if (s) s += i;
@@ -56,6 +59,7 @@ unsigned int ia4_fmt(char *s,char ip[4])
   i = fmt_str(s,"."); len += i; if (s) s += i;
   i = fmt_ulong(s,(unsigned long) ip[0]); len += i; if (s) s += i;
   i = fmt_str(s,".in-addr.arpa."); len += i; if (s) s += i;
+  // clang-format on
   return len;
 }
 
@@ -67,14 +71,15 @@ unsigned int ia4_fmt(char *s,char ip[4])
  @return int length of ip_address (ok > 0)
  */
 
-unsigned int ip4_scan(const char *s,char ip[4])
+unsigned int ip4_scan(const char *s, char ip[4])
 {
   unsigned int i;
   unsigned int len;
   unsigned long u;
 
-  byte_zero(ip,4);
+  byte_zero(ip, 4);
   len = 0;
+  // clang-format off
   i = scan_ulong((char *)s,&u); if (!i) { return 0; } ip[0] = u; s += i; len += i;
   if (*s != '.') { return 0; } ++s; ++len;
   i = scan_ulong((char *)s,&u); if (!i) { return 0; } ip[1] = u; s += i; len += i;
@@ -82,6 +87,7 @@ unsigned int ip4_scan(const char *s,char ip[4])
   i = scan_ulong((char *)s,&u); if (!i) { return 0; } ip[2] = u; s += i; len += i;
   if (*s != '.') { return 0; } ++s; ++len;
   i = scan_ulong((char *)s,&u); if (!i) { return 0; } ip[3] = u; s += i; len += i;
+  // clang-format on
   return len;
 }
 
@@ -93,12 +99,12 @@ unsigned int ip4_scan(const char *s,char ip[4])
  @return int length of ip_address (ok > 0)
  */
 
-unsigned int ip4_scanbracket(const char *s,char ip[4])
+unsigned int ip4_scanbracket(const char *s, char ip[4])
 {
   unsigned int len;
 
   if (*s != '[') return 0;
-  len = ip4_scan(s + 1,ip);
+  len = ip4_scan(s + 1, ip);
   if (!len) return 0;
   if (s[len + 1] != ']') return 0;
   return len + 2;
@@ -113,17 +119,17 @@ unsigned int ip4_scanbracket(const char *s,char ip[4])
  @return int length of ip6_address/ip
  */
 
-unsigned int ip4_cidr(char *s,char ip[4],unsigned long *plen)
+unsigned int ip4_cidr(char *s, char ip[4], unsigned long *plen)
 {
   unsigned int j = 0;
   *plen = 32UL;
 
-  j = str_chr(s,'/');
+  j = str_chr(s, '/');
   if (s[j] == '/') {
-     s[j] = 0;
-     j = scan_ulong(s + j + 1,plen);
-  } 
-  return ip4_scan((const char *)s,ip);
+    s[j] = 0;
+    j = scan_ulong(s + j + 1, plen);
+  }
+  return ip4_scan((const char *)s, ip);
 }
 
 /**
@@ -134,28 +140,28 @@ unsigned int ip4_cidr(char *s,char ip[4],unsigned long *plen)
  @return n: number of bytes, if ok; -1: memory shortage; -2: input error
  */
 
-unsigned int ip4_bytestring(stralloc *ipstring,char ip[4],int prefix)
+unsigned int ip4_bytestring(stralloc *ipstring, char ip[4], int prefix)
 {
   int i, j, n = 0;
   unsigned char number;
 
-  if (!stralloc_readyplus(ipstring,32)) return -1;
-  if (!stralloc_copys(ipstring,"")) return -1;
+  if (!stralloc_readyplus(ipstring, 32)) return -1;
+  if (!stralloc_copys(ipstring, "")) return -1;
 
   for (i = 0; i < 4; i++) {
-    number = (unsigned char) ip[i];
+    number = (unsigned char)ip[i];
     if (number > 255) return -2;
 
     for (j = 7; j >= 0; j--) {
       if (number & (1 << j)) {
-			  n++;
-        if (!stralloc_cats(ipstring,"1")) return -1;
+        n++;
+        if (!stralloc_cats(ipstring, "1")) return -1;
       } else {
-			  n++;
-        if (!stralloc_cats(ipstring,"0")) return -1;
+        n++;
+        if (!stralloc_cats(ipstring, "0")) return -1;
       }
       prefix--;
-			if (!prefix) goto DONE;
+      if (!prefix) goto DONE;
     }
   }