From: Source Maintenance <squidadm@squid-cache.org>
Date: Wed, 21 Jan 2015 18:12:04 +0000 (+0000)
Subject: SourceFormat Enforcement
X-Git-Tag: merge-candidate-3-v1~325
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5c634111f4ab8498699c0edc649204ca0c38a4cb;p=thirdparty%2Fsquid.git

SourceFormat Enforcement
---

diff --git a/src/main.cc b/src/main.cc
index d356ae8164..2fd0bc5b9a 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -263,7 +263,7 @@ SignalEngine::doShutdown(time_t wait)
         // Shutdown as soon as possible.
         wait = 0;
 #endif
-     } else {
+    } else {
         shutting_down = 1;
 
         /* run the closure code which can be shared with reconfigure */
@@ -277,7 +277,7 @@ SignalEngine::doShutdown(time_t wait)
     }
 
 #if USE_WIN32_SERVICE
-        WIN32_svcstatusupdate(SERVICE_STOP_PENDING, (wait + 1) * 1000);
+    WIN32_svcstatusupdate(SERVICE_STOP_PENDING, (wait + 1) * 1000);
 #endif
 
     eventAdd("SquidShutdown", &StopEventLoop, this, (double) (wait + 1), 1, false);
@@ -299,7 +299,8 @@ SignalEngine::handleStoppedChild()
 
 #else
 
-    }  while (pid > 0 || (pid < 0 && errno == EINTR));
+    }
+    while (pid > 0 || (pid < 0 && errno == EINTR));
 #endif
 #endif
 }
@@ -939,7 +940,7 @@ mainReconfigureFinish(void *)
     }
 
     if (!InDaemonMode())
-        writePidFile();	/* write PID file */
+        writePidFile(); /* write PID file */
 
     reconfiguring = 0;
 }
@@ -1837,7 +1838,7 @@ watch_child(char *argv[])
         // signals to kids. Otherwise, wait for a kid to die or for a signal
         // to abort the blocking WaitForAnyPid() call.
         // With the WNOHANG option, we could check whether WaitForAnyPid() was
-        // aborted by a dying kid or a signal, but it is not required: The 
+        // aborted by a dying kid or a signal, but it is not required: The
         // next do/while loop will check again for any dying kids.
         int waitFlag = 0;
         if (masterSignaled())
@@ -1867,7 +1868,7 @@ watch_child(char *argv[])
                        " be restarted due to repeated, frequent failures",
                        kid->name().termedBuf(), kid->getPid());
             }
-        } else if (pid > 0){
+        } else if (pid > 0) {
             syslog(LOG_NOTICE, "Squid Parent: unknown child process %d exited", pid);
         }
 
diff --git a/src/tools.cc b/src/tools.cc
index 59b1c38dd8..bddc09e348 100644
--- a/src/tools.cc
+++ b/src/tools.cc
@@ -1227,3 +1227,4 @@ WaitForOnePid(pid_t pid, PidStatus &status, int flags)
     return waitpid(pid, &status, flags);
 #endif
 }
+