--------------------- PatchSet 10312 Date: 2007/12/25 16:04:07 Author: serassio Branch: nt Tag: (none) Log: Ran indent Members: src/win32.c:1.7.8.23->1.7.8.24 Index: squid/src/win32.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/win32.c,v retrieving revision 1.7.8.23 retrieving revision 1.7.8.24 diff -u -r1.7.8.23 -r1.7.8.24 --- squid/src/win32.c 25 Dec 2007 16:02:19 -0000 1.7.8.23 +++ squid/src/win32.c 25 Dec 2007 16:04:07 -0000 1.7.8.24 @@ -362,14 +362,14 @@ WIN32_Exit(); } -void +void WIN32_IpAddrChangeMonitorExit() { DWORD status = ERROR_SUCCESS; if (NotifyAddrChange_thread == INVALID_HANDLE_VALUE) { - TerminateThread(NotifyAddrChange_thread, status); - CloseHandle(NotifyAddrChange_thread); + TerminateThread(NotifyAddrChange_thread, status); + CloseHandle(NotifyAddrChange_thread); } } @@ -405,7 +405,7 @@ PFNotifyAddrChange NotifyAddrChange; if ((IPHLPAPIHandle = GetModuleHandle("IPHLPAPI")) == NULL) - IPHLPAPIHandle = LoadLibrary("IPHLPAPI"); + IPHLPAPIHandle = LoadLibrary("IPHLPAPI"); NotifyAddrChange = (PFNotifyAddrChange) GetProcAddress(IPHLPAPIHandle, NOTIFYADDRCHANGE); while (1) { @@ -420,21 +420,21 @@ return 0; } -DWORD +DWORD WIN32_IpAddrChangeMonitorInit() { DWORD status = ERROR_SUCCESS; DWORD threadID = 0, ThrdParam = 0; if (WIN32_run_mode == _WIN_SQUID_RUN_MODE_SERVICE) { - NotifyAddrChange_thread = CreateThread(NULL, 0, WIN32_IpAddrChangeMonitor, - &ThrdParam, 0, &threadID); - if (NotifyAddrChange_thread == NULL) { - status = GetLastError(); - NotifyAddrChange_thread = INVALID_HANDLE_VALUE; - debug(1, 1) ("Failed to start IP monitor thread.\n"); - } else - debug(1, 2) ("Starting IP monitor thread [%li] ...\n", threadID); + NotifyAddrChange_thread = CreateThread(NULL, 0, WIN32_IpAddrChangeMonitor, + &ThrdParam, 0, &threadID); + if (NotifyAddrChange_thread == NULL) { + status = GetLastError(); + NotifyAddrChange_thread = INVALID_HANDLE_VALUE; + debug(1, 1) ("Failed to start IP monitor thread.\n"); + } else + debug(1, 2) ("Starting IP monitor thread [%li] ...\n", threadID); } return status; }