From ecfe36ebe4593bf5092450bb97750d49e5edca88 Mon Sep 17 00:00:00 2001
From: sletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224>
Date: Mon, 19 May 2008 14:09:28 +0000
Subject: [PATCH] Cleanup on Windows

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@2286 0c269be4-1314-0410-8aa9-9f06e86f4224
---
 windows/JackWinNamedPipeServerChannel.cpp |  2 +-
 windows/JackdmpWIN32.cpp                  | 13 ++-----------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/windows/JackWinNamedPipeServerChannel.cpp b/windows/JackWinNamedPipeServerChannel.cpp
index c8e527b2..688835da 100644
--- a/windows/JackWinNamedPipeServerChannel.cpp
+++ b/windows/JackWinNamedPipeServerChannel.cpp
@@ -84,7 +84,7 @@ void JackClientPipeThread::Close()					// Close the Server/Client connection
 bool JackClientPipeThread::Execute()
 {
     jack_log("JackClientPipeThread::Execute");
-    return(HandleRequest();
+    return(HandleRequest());
 }
 
 bool JackClientPipeThread::HandleRequest()
diff --git a/windows/JackdmpWIN32.cpp b/windows/JackdmpWIN32.cpp
index fab39027..c2829f8f 100644
--- a/windows/JackdmpWIN32.cpp
+++ b/windows/JackdmpWIN32.cpp
@@ -36,7 +36,6 @@ static JackServer* fServer;
 static char *server_name = "default";
 static int realtime_priority = 10;
 static int do_mlock = 1;
-static unsigned int port_max = 128;
 static int realtime = 0;
 static int loopback = 0;
 static int temporary = 0;
@@ -73,11 +72,8 @@ static void usage (FILE *file)
     fprintf (file, "\n"
              "usage: jackdmp [ --realtime OR -R [ --realtime-priority OR -P priority ] ]\n"
              "               [ --name OR -n server-name ]\n"
-             // "               [ --no-mlock OR -m ]\n"
-             // "               [ --unlock OR -u ]\n"
              "               [ --timeout OR -t client-timeout-in-msecs ]\n"
              "               [ --loopback OR -L loopback-port-number ]\n"
-             // "               [ --port-max OR -p maximum-number-of-ports]\n"
              "               [ --verbose OR -v ]\n"
              "               [ --replace-registry OR -r ]\n"
              "               [ --silent OR -s ]\n"
@@ -252,10 +248,9 @@ BOOL CtrlHandler( DWORD fdwCtrlType )
 int main(int argc, char* argv[])
 {
     jack_driver_desc_t * driver_desc;
-    const char *options = "-ad:P:uvshVRL:STFl:t:mn:p:";
+    const char *options = "-ad:P:uvshVRL:STFl:t:mn:";
     struct option long_options[] = {
-                                       { "driver", 1, 0, 'd'
-                                       },
+                                       { "driver", 1, 0, 'd'},
                                        { "verbose", 0, 0, 'v' },
                                        { "help", 0, 0, 'h' },
                                        { "port-max", 1, 0, 'p' },
@@ -325,10 +320,6 @@ int main(int argc, char* argv[])
                 do_mlock = 0;
                 break;
 
-            case 'p':
-                port_max = (unsigned int)atol(optarg);
-                break;
-
             case 'P':
                 realtime_priority = atoi(optarg);
                 break;