---------------------
PatchSet 3106 
Date: 2006/05/14 17:21:08
Author: serassio
Branch: nt
Tag: (none) 
Log:
Cosmetic changes

Members: 
	src/unlinkd.cc:1.7.2.5->1.7.2.6 

Index: squid3/src/unlinkd.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/unlinkd.cc,v
retrieving revision 1.7.2.5
retrieving revision 1.7.2.6
diff -u -r1.7.2.5 -r1.7.2.6
--- squid3/src/unlinkd.cc	7 Jan 2005 09:30:28 -0000	1.7.2.5
+++ squid3/src/unlinkd.cc	14 May 2006 17:21:08 -0000	1.7.2.6
@@ -1,6 +1,6 @@
 
 /*
- * $Id: unlinkd.cc,v 1.7.2.5 2005/01/07 09:30:28 serassio Exp $
+ * $Id: unlinkd.cc,v 1.7.2.6 2006/05/14 17:21:08 serassio Exp $
  *
  * DEBUG: section 2     Unlink Daemon
  * AUTHOR: Duane Wessels
@@ -179,11 +179,11 @@
 
 void
 unlinkdClose(void)
-{
 #ifdef _SQUID_MSWIN_
+{
 
     if (unlinkd_wfd > -1) {
-        debug(2, 1) ("Closing unlinkd pipe on FD %d\n", unlinkd_wfd);
+        debugs(2, 1, "Closing unlinkd pipe on FD " << unlinkd_wfd);
         shutdown(unlinkd_wfd, SD_BOTH);
         comm_close(unlinkd_wfd);
 
@@ -194,25 +194,23 @@
 
         unlinkd_rfd = -1;
     } else
-        debug(2, 0) ("unlinkdClose: WARNING: unlinkd_wfd is %d\n",
-                     unlinkd_wfd);
+        debugs(2, 0, "unlinkdClose: WARNING: unlinkd_wfd is " << unlinkd_wfd);
 
     if (hIpc) {
         if (WaitForSingleObject(hIpc, 5000) != WAIT_OBJECT_0) {
             getCurrentTime();
-            debug(2, 1)
-            ("unlinkdClose: WARNING: (unlinkd,%d) didn't exit in 5 seconds\n",
-             pid);
+            debugs(2, 1, "unlinkdClose: WARNING: (unlinkd," << pid << "d) didn't exit in 5 seconds");
         }
 
         CloseHandle(hIpc);
     }
-
+}
 #else
+{
 if (unlinkd_wfd < 0)
     return;
 
-debug(2, 1) ("Closing unlinkd pipe on FD %d\n", unlinkd_wfd);
+    debugs(2, 1, "Closing unlinkd pipe on FD " << unlinkd_wfd);
 
 file_close(unlinkd_wfd);
 
@@ -222,9 +220,9 @@
 unlinkd_wfd = -1;
 
 unlinkd_rfd = -1;
+}
 
 #endif
-}
 
 void
 unlinkdInit(void)