Cleanup.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4638 0c269be4-1314-0410-8aa9-9f06e86f4224

4 files changed, 16 insertions, 59 deletions

diff --git a/windows/JackNetWinSocket.h b/windows/JackNetWinSocket.h
index a96f1b0e..153f65bb 100644
--- a/windows/JackNetWinSocket.h
+++ b/windows/JackNetWinSocket.h
@@ -27,9 +27,9 @@
 #include <stdint.h>
 #endif
 
-
 namespace Jack
 {
+
 #define E(code, s) { code, s }
 #define NET_ERROR_CODE WSAGetLastError()
 #define StrError PrintError
diff --git a/windows/JackShmMem_os.h b/windows/JackShmMem_os.h
index ba8e87f9..9f1891f9 100644
--- a/windows/JackShmMem_os.h
+++ b/windows/JackShmMem_os.h
@@ -24,27 +24,27 @@
 
 inline bool CHECK_MLOCK(void* ptr, size_t size)
 {
-    if (!VirtualLock((ptr), (size))) {

+    if (!VirtualLock((ptr), (size))) {
         SIZE_T minWSS, maxWSS;
         HANDLE hProc = GetCurrentProcess();
-        if (GetProcessWorkingSetSize(hProc, &minWSS, &maxWSS)) {

+        if (GetProcessWorkingSetSize(hProc, &minWSS, &maxWSS)) {
             const size_t increase = size + (10 * 4096);
-            maxWSS += increase;

+            maxWSS += increase;
             minWSS += increase;
             if (!SetProcessWorkingSetSize(hProc, minWSS, maxWSS)) {
-                jack_error("SetProcessWorkingSetSize error = %d", GetLastError());

+                jack_error("SetProcessWorkingSetSize error = %d", GetLastError());
                 return false;
             } else if (!VirtualLock((ptr), (size))) {
-                jack_error("VirtualLock error = %d", GetLastError());

+                jack_error("VirtualLock error = %d", GetLastError());
                 return false;
-            } else {

+            } else {
                 return true;
             }
-        } else {

-            return false;

+        } else {
+            return false;
         }
-    } else {

-        return true;

+    } else {
+        return true;
     }
 }
 
@@ -53,3 +53,4 @@ inline bool CHECK_MLOCK(void* ptr, size_t size)
 #define CHECK_MUNLOCKALL()(false)
 
 #endif
+
diff --git a/windows/JackWinNamedPipe.cpp b/windows/JackWinNamedPipe.cpp
index 3b2d8440..8d277673 100644
--- a/windows/JackWinNamedPipe.cpp
+++ b/windows/JackWinNamedPipe.cpp
@@ -370,52 +370,6 @@ int JackWinAsyncNamedPipeServer::Bind(const char* dir, const char* name, int whi
     return BindAux();
 }
 
-/*
-int JackWinAsyncNamedPipeServer::Bind(const char* dir, int which)
-{
-    snprintf(fName, sizeof(fName), "\\\\.\\pipe\\%s_jack_%d", dir, which);
-    jack_log("Bind: fName %s", fName);
-
-    if ((fNamedPipe = CreateNamedPipe(fName,
-                                      PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED,  // read/write access
-                                      PIPE_TYPE_MESSAGE |  // message type pipe
-                                      PIPE_READMODE_MESSAGE |  // message-read mode
-                                      PIPE_WAIT,  // blocking mode
-                                      PIPE_UNLIMITED_INSTANCES,  // max. instances
-                                      BUFSIZE,  // output buffer size
-                                      BUFSIZE,  // input buffer size
-                                      INFINITE,  // client time-out
-                                      NULL)) == INVALID_HANDLE_VALUE) { // no security a
-        jack_error("Cannot bind server to pipe err = %ld", GetLastError());
-        return -1;
-    } else {
-        return 0;
-    }
-}
-
-int JackWinAsyncNamedPipeServer::Bind(const char* dir, const char* name, int which)
-{
-    snprintf(fName, sizeof(fName), "\\\\.\\pipe\\%s_jack_%s_%d", dir, name, which);
-    jack_log("Bind: fName %s", fName);
-
-    if ((fNamedPipe = CreateNamedPipe(fName,
-                                      PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED,  // read/write access
-                                      PIPE_TYPE_MESSAGE |  // message type pipe
-                                      PIPE_READMODE_MESSAGE |  // message-read mode
-                                      PIPE_WAIT,  // blocking mode
-                                      PIPE_UNLIMITED_INSTANCES,  // max. instances
-                                      BUFSIZE,  // output buffer size
-                                      BUFSIZE,  // input buffer size
-                                      INFINITE,  // client time-out
-                                      NULL)) == INVALID_HANDLE_VALUE) { // no security a
-        jack_error("Cannot bind server to pipe err = %ld", GetLastError());
-        return -1;
-    } else {
-        return 0;
-    }
-}
-*/
-
 bool JackWinAsyncNamedPipeServer::Accept()
 {
     return false;
diff --git a/windows/JackWinSemaphore.cpp b/windows/JackWinSemaphore.cpp
index 884d9f00..d347f605 100644
--- a/windows/JackWinSemaphore.cpp
+++ b/windows/JackWinSemaphore.cpp
@@ -38,8 +38,9 @@ bool JackWinSemaphore::Signal()
     BOOL res;
     assert(fSemaphore);
 
-    if (fFlush)
+    if (fFlush) {
         return true;
+    }
 
     if (!(res = ReleaseSemaphore(fSemaphore, 1, NULL))) {
         jack_error("JackWinSemaphore::Signal name = %s err = %ld", fName, GetLastError());
@@ -53,8 +54,9 @@ bool JackWinSemaphore::SignalAll()
     BOOL res;
     assert(fSemaphore);
 
-    if (fFlush)
+    if (fFlush) {
         return true;
+    }
 
     if (!(res = ReleaseSemaphore(fSemaphore, 1, NULL))) {
         jack_error("JackWinSemaphore::SignalAll name = %s err = %ld", fName, GetLastError());