Source Format Enforcement (#1201)

diff --git a/compat/krb5.h b/compat/krb5.h
index b3e13388933ff2df3191cb200f38ac14cc40a295..962853327f3ff0ad54f5b6926a7915ec85f05626 100644 (file)
--- a/compat/krb5.h
+++ b/compat/krb5.h
@@ -32,15 +32,15 @@
 #    define KERBEROS_APPLE_DEPRECATED(x)
 #  endif
 #  if HAVE_BROKEN_HEIMDAL_KRB5_H && defined(__cplusplus)
-     extern "C" {
+extern "C" {
 #      include <krb5.h>
-     }
+}
 #  elif HAVE_BROKEN_SOLARIS_KRB5_H && defined(__cplusplus)
 #    define KRB5INT_BEGIN_DECLS extern "C" {
 #    define KRB5INT_END_DECLS
-     extern "C" {
+extern "C" {
 #      include <krb5.h>
-     /* broken Solaris krb5.h contains the closing } */
+    /* broken Solaris krb5.h contains the closing } */
 #  else
 #    include <krb5.h>
 #  endif

diff --git a/src/ConfigParser.cc b/src/ConfigParser.cc
index 5dce42b5fe45b8174cad7988c7b7fb3db0a82487..d8a426ace3b1ca8066af1d0ca89a79ccdac9589c 100644 (file)
--- a/src/ConfigParser.cc
+++ b/src/ConfigParser.cc
@@ -514,7 +514,7 @@ ConfigParser::cachePeer(const char *peerNameTokenDescription)
             return *p;
 
         throw TextException(ToSBuf("Cannot find a previously declared cache_peer referred to by ",
-            peerNameTokenDescription, " as ", name), Here());
+                                   peerNameTokenDescription, " as ", name), Here());
     }
 
     throw TextException(ToSBuf("Missing ", peerNameTokenDescription), Here());

diff --git a/src/Makefile.am b/src/Makefile.am
index 99738cd9088686cacdf3b0d055e86caf83457c39..fb3bd3009be78e692548384af652f8952f1a253d 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1445,11 +1445,11 @@ tests_testStore_SOURCES = \
        tests/stub_libformat.cc \
        tests/stub_libsecurity.cc \
        tests/stub_libsslsquid.cc \
-       tests/stub_neighbors.cc \
        log/access_log.h \
        mem_node.cc \
        tests/stub_mime.cc \
        mime.h \
+       tests/stub_neighbors.cc \
        refresh.cc \
        refresh.h \
        repl_modules.h \
@@ -1693,8 +1693,8 @@ tests_testACLMaxUserIP_SOURCES = \
        tests/testACLMaxUserIP.cc \
        tests/testACLMaxUserIP.h
 nodist_tests_testACLMaxUserIP_SOURCES = \
-       ConfigParser.cc \
        tests/stub_CachePeer.cc \
+       ConfigParser.cc \
        tests/stub_HelperChildConfig.cc \
        tests/stub_HttpHeader.cc \
        tests/stub_HttpRequest.cc \
@@ -2022,8 +2022,8 @@ tests_testHttp1Parser_LDFLAGS = $(LIBADD_DL)
 
 check_PROGRAMS += tests/testHttpReply
 tests_testHttpReply_SOURCES = \
-       ConfigParser.cc \
        tests/stub_CachePeer.cc \
+       ConfigParser.cc \
        tests/stub_ETag.cc \
        tests/stub_HelperChildConfig.cc \
        HttpBody.cc \
@@ -2088,10 +2088,10 @@ tests_testHttpReply_SOURCES = \
        tests/stub_libmgr.cc \
        tests/stub_libsecurity.cc \
        tests/stub_libsslsquid.cc \
-       tests/stub_neighbors.cc \
        log/access_log.h \
        mime_header.cc \
        mime_header.h \
+       tests/stub_neighbors.cc \
        repl_modules.h \
        tests/stub_store.cc \
        tests/stub_store_stats.cc \

diff --git a/src/ipc.cc b/src/ipc.cc
index 25a97898c0cf9e21274e67c582c5a80311bffa18..1d24732c6962be7afc9d20138952db0d0c6b342b 100644 (file)
--- a/src/ipc.cc
+++ b/src/ipc.cc
@@ -96,10 +96,10 @@ ipcCreate(int type, const char *prog, const char *const args[], const char *name
 
     if (type == IPC_TCP_SOCKET) {
         crfd = cwfd = comm_open_listener(SOCK_STREAM,
-                                0,
-                                local_addr,
-                                COMM_NOCLOEXEC,
-                                name);
+                                         0,
+                                         local_addr,
+                                         COMM_NOCLOEXEC,
+                                         name);
         prfd = pwfd = comm_open(SOCK_STREAM,
                                 0,          /* protocol */
                                 local_addr,

diff --git a/src/ipc_win32.cc b/src/ipc_win32.cc
index 261f942fd6fea8540da853608722817170751e47..aa0f1f7639d63601084f809b66893a6e4b816c28 100644 (file)
--- a/src/ipc_win32.cc
+++ b/src/ipc_win32.cc
@@ -128,10 +128,10 @@ ipcCreate(int type, const char *prog, const char *const args[], const char *name
 
     if (type == IPC_TCP_SOCKET) {
         crfd = cwfd = comm_open_listener(SOCK_STREAM,
-                                IPPROTO_TCP,
-                                local_addr,
-                                COMM_NOCLOEXEC,
-                                name);
+                                         IPPROTO_TCP,
+                                         local_addr,
+                                         COMM_NOCLOEXEC,
+                                         name);
         prfd = pwfd = comm_open(SOCK_STREAM,
                                 IPPROTO_TCP,    /* protocol */
                                 local_addr,