From: Automatic source maintenance <squidadm@squid-cache.org>
Date: Wed, 10 Oct 2012 00:13:20 +0000 (-0600)
Subject: SourceFormat Enforcement
X-Git-Tag: SQUID_3_4_0_1~584
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ec6d36d2acaf18fc508a174c4149138f968f8a2d;p=thirdparty%2Fsquid.git

SourceFormat Enforcement
---

diff --git a/compat/mswindows.cc b/compat/mswindows.cc
index 540767054c..4620fe9a0d 100644
--- a/compat/mswindows.cc
+++ b/compat/mswindows.cc
@@ -53,7 +53,6 @@
 #include <mswsock.h>
 #endif
 
-
 THREADLOCAL int ws32_result;
 LPCRITICAL_SECTION dbg_mutex = NULL;
 
@@ -356,59 +355,59 @@ static HANDLE ms_eventlog;
 void
 openlog(const char *ident, int logopt, int facility)
 {
-        if (ms_eventlog)
-                return;
+    if (ms_eventlog)
+        return;
 
-        ms_eventlog = RegisterEventSourceA(NULL, ident);
+    ms_eventlog = RegisterEventSourceA(NULL, ident);
 
-		// note: RegisterEventAtSourceA may fail and return NULL.
-        //   in that case we'll just retry at the next message or not log
+    // note: RegisterEventAtSourceA may fail and return NULL.
+    //   in that case we'll just retry at the next message or not log
 }
 #define SYSLOG_MAX_MSG_SIZE 1024
 
 void
 syslog(int priority, const char *fmt, ...)
 {
-        WORD logtype;
-        char *str=static_cast<char *>(xmalloc(SYSLOG_MAX_MSG_SIZE));
-        int str_len;
-        va_list ap;
+    WORD logtype;
+    char *str=static_cast<char *>(xmalloc(SYSLOG_MAX_MSG_SIZE));
+    int str_len;
+    va_list ap;
 
-        if (!ms_eventlog)
-                return;
+    if (!ms_eventlog)
+        return;
 
-        va_start(ap, fmt);
-        str_len = vsnprintf(str, SYSLOG_MAX_MSG_SIZE-1, fmt, ap);
-        va_end(ap);
+    va_start(ap, fmt);
+    str_len = vsnprintf(str, SYSLOG_MAX_MSG_SIZE-1, fmt, ap);
+    va_end(ap);
 
-        if (str_len < 0) {
-        	/* vsnprintf failed */
-            return;
-        }
+    if (str_len < 0) {
+        /* vsnprintf failed */
+        return;
+    }
 
-        switch (priority) {
-        case LOG_EMERG:
-        case LOG_ALERT:
-        case LOG_CRIT:
-        case LOG_ERR:
-                logtype = EVENTLOG_ERROR_TYPE;
-                break;
-
-        case LOG_WARNING:
-                logtype = EVENTLOG_WARNING_TYPE;
-                break;
-
-        case LOG_NOTICE:
-        case LOG_INFO:
-        case LOG_DEBUG:
-        default:
-                logtype = EVENTLOG_INFORMATION_TYPE;
-                break;
-        }
+    switch (priority) {
+    case LOG_EMERG:
+    case LOG_ALERT:
+    case LOG_CRIT:
+    case LOG_ERR:
+        logtype = EVENTLOG_ERROR_TYPE;
+        break;
+
+    case LOG_WARNING:
+        logtype = EVENTLOG_WARNING_TYPE;
+        break;
+
+    case LOG_NOTICE:
+    case LOG_INFO:
+    case LOG_DEBUG:
+    default:
+        logtype = EVENTLOG_INFORMATION_TYPE;
+        break;
+    }
 
-        //Windows API suck. They are overengineered
-        ReportEventA(ms_eventlog, logtype, 0, 0, NULL, 1, 0,
-            const_cast<const char **>(&str), NULL);
+    //Windows API suck. They are overengineered
+    ReportEventA(ms_eventlog, logtype, 0, 0, NULL, 1, 0,
+                 const_cast<const char **>(&str), NULL);
 }
 
 /* note: this is all MSWindows-specific code; all of it should be conditional */
diff --git a/compat/os/mswindows.h b/compat/os/mswindows.h
index 4caa8c62a8..5644a28945 100644
--- a/compat/os/mswindows.h
+++ b/compat/os/mswindows.h
@@ -498,8 +498,7 @@ connect(int s, const struct sockaddr * n, socklen_t l)
 }
 
 inline struct hostent *
-gethostbyname(const char *n)
-{
+gethostbyname(const char *n) {
     HOSTENT FAR * result;
     if ((result = ::gethostbyname(n)) == NULL)
         errno = WSAGetLastError();
@@ -812,42 +811,42 @@ SQUIDCEXTERN struct group * getgrnam(char *unused);
 static inline uid_t
 geteuid(void)
 {
-       return 100;
+    return 100;
 }
 static inline int
 seteuid (uid_t euid)
 {
-       return 0;
+    return 0;
 }
 static inline uid_t
 getuid(void)
 {
-       return 100;
+    return 100;
 }
 static inline int
 setuid (uid_t uid)
 {
-       return 0;
+    return 0;
 }
 static inline gid_t
 getegid(void)
 {
-       return 100;
+    return 100;
 }
 static inline int
 setegid (gid_t egid)
 {
-       return 0;
+    return 0;
 }
 static inline int
 getgid(void)
 {
-       return 100;
+    return 100;
 }
 static inline int
 setgid (gid_t gid)
 {
-       return 0;
+    return 0;
 }
 
 /* for some reason autoconf misdetects getpagesize.. */