From: Amos Jeffries <amosjeffries@squid-cache.org>
Date: Sun, 17 Oct 2010 04:05:30 +0000 (-0600)
Subject: SourceFormat Enforcements
X-Git-Tag: take1~178
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=24520b1bd8684f80878749274b0859a9a3f9191b;p=thirdparty%2Fsquid.git

SourceFormat Enforcements
---

diff --git a/include/rfc1035.h b/include/rfc1035.h
index 2728cbfc2a..e922c15d38 100644
--- a/include/rfc1035.h
+++ b/include/rfc1035.h
@@ -105,7 +105,7 @@ SQUIDCEXTERN ssize_t rfc1035BuildPTRQuery(const struct in_addr,
         size_t sz,
         unsigned short qid,
         rfc1035_query * query,
-                                        ssize_t edns_sz);
+        ssize_t edns_sz);
 SQUIDCEXTERN void rfc1035SetQueryID(char *, unsigned short qid);
 SQUIDCEXTERN int rfc1035MessageUnpack(const char *buf,
                                       size_t sz,
diff --git a/include/rfc3596.h b/include/rfc3596.h
index 912db74f5b..1379bf6bdd 100644
--- a/include/rfc3596.h
+++ b/include/rfc3596.h
@@ -55,21 +55,21 @@ SQUIDCEXTERN ssize_t rfc3596BuildAAAAQuery(const char *hostname,
         size_t sz,
         unsigned short qid,
         rfc1035_query * query,
-                                        ssize_t edns_sz);
+        ssize_t edns_sz);
 
 SQUIDCEXTERN ssize_t rfc3596BuildPTRQuery4(const struct in_addr,
         char *buf,
         size_t sz,
         unsigned short qid,
         rfc1035_query * query,
-                                        ssize_t edns_sz);
+        ssize_t edns_sz);
 
 SQUIDCEXTERN ssize_t rfc3596BuildPTRQuery6(const struct in6_addr,
         char *buf,
         size_t sz,
         unsigned short qid,
         rfc1035_query * query,
-                                        ssize_t edns_sz);
+        ssize_t edns_sz);
 
 /* RFC3596 library implements RFC1035 generic host interface */
 SQUIDCEXTERN ssize_t rfc3596BuildHostQuery(const char *hostname,
@@ -78,7 +78,7 @@ SQUIDCEXTERN ssize_t rfc3596BuildHostQuery(const char *hostname,
         unsigned short qid,
         rfc1035_query * query,
         int qtype,
-                                        ssize_t edns_sz);
+        ssize_t edns_sz);
 
 /* RFC3596 section 2.1 defines new RR type AAAA as 28 */
 #define RFC1035_TYPE_AAAA 28
diff --git a/lib/rfc3596.c b/lib/rfc3596.c
index d9d202fa60..3d64b104f4 100644
--- a/lib/rfc3596.c
+++ b/lib/rfc3596.c
@@ -265,23 +265,21 @@ main(int argc, char *argv[])
 
         if ( ! inet_pton(AF_INET6, argv[var], &((struct sockaddr_in6 *)S)->sin6_addr.s_addr) ) {
             perror("listen address");
-        return 1;
-    }
+            return 1;
+        }
 
-    s = socket(PF_INET6, SOCK_DGRAM, 0);
-}
-else
-{
-    S = (struct sockaddr *) new sockaddr_in;
-    memset(S,0,sizeof(struct sockaddr_in));
+        s = socket(PF_INET6, SOCK_DGRAM, 0);
+    } else {
+        S = (struct sockaddr *) new sockaddr_in;
+        memset(S,0,sizeof(struct sockaddr_in));
 
-    ((struct sockaddr_in *)S)->sin_family = AF_INET;
-    ((struct sockaddr_in *)S)->sin_port = htons(atoi(argv[var+1]));
+        ((struct sockaddr_in *)S)->sin_family = AF_INET;
+        ((struct sockaddr_in *)S)->sin_port = htons(atoi(argv[var+1]));
 
-    if ( ! inet_pton(AF_INET, argv[var], &((struct sockaddr_in *)S)->sin_addr.s_addr) )
-        perror("listen address");
-    return 1;
-}
+        if ( ! inet_pton(AF_INET, argv[var], &((struct sockaddr_in *)S)->sin_addr.s_addr) )
+            perror("listen address");
+        return 1;
+    }
 }
 
 while (fgets(input, PACKET_BUFSZ, stdin))
@@ -374,6 +372,6 @@ while (fgets(input, PACKET_BUFSZ, stdin))
 }
 
 return 0;
-       }
+}
 
 #endif
diff --git a/src/dns_internal.cc b/src/dns_internal.cc
index 3ca63105ef..f6c2fa35c1 100644
--- a/src/dns_internal.cc
+++ b/src/dns_internal.cc
@@ -90,24 +90,24 @@
 static int RcodeMatrix[MAX_RCODE][MAX_ATTEMPT];
 // NP: see http://www.iana.org/assignments/dns-parameters
 static const char *Rcodes[] = {
- /* RFC 1035 */
-         "Success",
-         "Packet Format Error",
-         "DNS Server Failure",
-         "Non-Existent Domain",
-         "Not Implemented",
-         "Query Refused",
- /* RFC 2136 */
-         "Name Exists when it should not",
-         "RR Set Exists when it should not",
-         "RR Set that should exist does not",
-         "Server Not Authoritative for zone",
-         "Name not contained in zone",
- /* unassigned */
-         "","","","","",
- /* RFC 2671 */
-         "Bad OPT Version or TSIG Signature Failure"
- };
+    /* RFC 1035 */
+    "Success",
+    "Packet Format Error",
+    "DNS Server Failure",
+    "Non-Existent Domain",
+    "Not Implemented",
+    "Query Refused",
+    /* RFC 2136 */
+    "Name Exists when it should not",
+    "RR Set Exists when it should not",
+    "RR Set that should exist does not",
+    "Server Not Authoritative for zone",
+    "Name not contained in zone",
+    /* unassigned */
+    "","","","","",
+    /* RFC 2671 */
+    "Bad OPT Version or TSIG Signature Failure"
+};
 
 typedef struct _idns_query idns_query;