--------------------- PatchSet 3107 Date: 2006/05/14 17:32:05 Author: serassio Branch: nt Tag: (none) Log: Ran astyle Members: src/unlinkd.cc:1.7.2.6->1.7.2.7 Index: squid3/src/unlinkd.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/unlinkd.cc,v retrieving revision 1.7.2.6 retrieving revision 1.7.2.7 diff -u -r1.7.2.6 -r1.7.2.7 --- squid3/src/unlinkd.cc 14 May 2006 17:21:08 -0000 1.7.2.6 +++ squid3/src/unlinkd.cc 14 May 2006 17:32:05 -0000 1.7.2.7 @@ -1,6 +1,6 @@ /* - * $Id: unlinkd.cc,v 1.7.2.6 2006/05/14 17:21:08 serassio Exp $ + * $Id: unlinkd.cc,v 1.7.2.7 2006/05/14 17:32:05 serassio Exp $ * * DEBUG: section 2 Unlink Daemon * AUTHOR: Duane Wessels @@ -182,7 +182,8 @@ #ifdef _SQUID_MSWIN_ { - if (unlinkd_wfd > -1) { + if (unlinkd_wfd > -1) + { debugs(2, 1, "Closing unlinkd pipe on FD " << unlinkd_wfd); shutdown(unlinkd_wfd, SD_BOTH); comm_close(unlinkd_wfd); @@ -196,7 +197,8 @@ } else debugs(2, 0, "unlinkdClose: WARNING: unlinkd_wfd is " << unlinkd_wfd); - if (hIpc) { + if (hIpc) + { if (WaitForSingleObject(hIpc, 5000) != WAIT_OBJECT_0) { getCurrentTime(); debugs(2, 1, "unlinkdClose: WARNING: (unlinkd," << pid << "d) didn't exit in 5 seconds"); @@ -207,19 +209,20 @@ } #else { -if (unlinkd_wfd < 0) - return; + + if (unlinkd_wfd < 0) + return; debugs(2, 1, "Closing unlinkd pipe on FD " << unlinkd_wfd); -file_close(unlinkd_wfd); + file_close(unlinkd_wfd); -if (unlinkd_wfd != unlinkd_rfd) - file_close(unlinkd_rfd); + if (unlinkd_wfd != unlinkd_rfd) + file_close(unlinkd_rfd); -unlinkd_wfd = -1; + unlinkd_wfd = -1; -unlinkd_rfd = -1; + unlinkd_rfd = -1; } #endif