Use of jack_free instead of free, cleanup.

8 files changed, 12 insertions, 18 deletions

diff --git a/common/JackInternalClient.cpp b/common/JackInternalClient.cpp
index 5b7060c9..df0cad18 100644
--- a/common/JackInternalClient.cpp
+++ b/common/JackInternalClient.cpp
@@ -27,10 +27,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #include "JackServer.h"
 #include "JackEngineControl.h"
 #include "JackClientControl.h"
-
 #include "JackInternalClientChannel.h"
-#include "JackGenericClientChannel.h"
-
 #include "JackTools.h"
 #include <assert.h>
 
diff --git a/common/JackLibAPI.cpp b/common/JackLibAPI.cpp
index 83e8dc6a..1855e04e 100644
--- a/common/JackLibAPI.cpp
+++ b/common/JackLibAPI.cpp
@@ -166,7 +166,7 @@ static jack_client_t* jack_client_open_aux(const char* client_name, jack_options
 
 LIB_EXPORT jack_client_t* jack_client_open(const char* ext_client_name, jack_options_t options, jack_status_t* status, ...)
 {
-        JackGlobals::CheckContext("jack_client_open");
+    JackGlobals::CheckContext("jack_client_open");
 
     try {
         assert(JackGlobals::fOpenMutex);
diff --git a/common/JackRequestDecoder.cpp b/common/JackRequestDecoder.cpp
index 884b9510..e1245f3d 100644
--- a/common/JackRequestDecoder.cpp
+++ b/common/JackRequestDecoder.cpp
@@ -46,7 +46,7 @@ int JackRequestDecoder::HandleRequest(detail::JackChannelTransactionInterface* s
 {
     JackRequest::RequestType type = (JackRequest::RequestType)type_aux;
 
-   // Read data
+    // Read data
     switch (type) {
 
         case JackRequest::kClientCheck: {
@@ -82,7 +82,7 @@ int JackRequestDecoder::HandleRequest(detail::JackChannelTransactionInterface* s
             CheckRead(req, socket);
             res.fResult = fServer->GetEngine()->ClientExternalClose(req.fRefNum);
             CheckWriteRefNum("JackRequest::ClientClose", socket);
-            fHandler->ClientRemove(socket, req.fRefNum);

+            fHandler->ClientRemove(socket, req.fRefNum);
             // Will cause the wrapping thread to stop
             return -1;
         }
diff --git a/common/jack/intclient.h b/common/jack/intclient.h
index 50d758d9..4c126d74 100644
--- a/common/jack/intclient.h
+++ b/common/jack/intclient.h
@@ -40,7 +40,7 @@ extern "C"
  *
  * @return NULL if unsuccessful, otherwise pointer to the internal
  * client name obtained from the heap via malloc().  The caller should
- * free() this storage when no longer needed.
+ * jack_free() this storage when no longer needed.
  */
 char *jack_get_internal_client_name (jack_client_t *client,
                                      jack_intclient_t intclient);
diff --git a/common/jack/jack.h b/common/jack/jack.h
index 7efa7c1f..5eb8e166 100644
--- a/common/jack/jack.h
+++ b/common/jack/jack.h
@@ -798,7 +798,7 @@ int jack_port_connected_to (const jack_port_t *port,
  * @return a null-terminated array of full port names to which the @a
  * port is connected.  If none, returns NULL.
  *
- * The caller is responsible for calling jack_free(3) on any non-NULL
+ * The caller is responsible for calling jack_free() on any non-NULL
  * returned value.
  *
  * @param port locally owned jack_port_t pointer.
@@ -811,7 +811,7 @@ const char ** jack_port_get_connections (const jack_port_t *port) JACK_OPTIONAL_
  * @return a null-terminated array of full port names to which the @a
  * port is connected.  If none, returns NULL.
  *
- * The caller is responsible for calling jack_free(3) on any non-NULL
+ * The caller is responsible for calling jack_free() on any non-NULL
  * returned value.
  *
  * This differs from jack_port_get_connections() in two important
@@ -1220,7 +1220,7 @@ int jack_recompute_total_latency (jack_client_t*, jack_port_t* port) JACK_OPTION
  * If zero, no selection based on flags will be carried out.
  *
  * @return a NULL-terminated array of ports that match the specified
- * arguments.  The caller is responsible for calling jack_free(3) any
+ * arguments.  The caller is responsible for calling jack_free() any
  * non-NULL returned value.
  *
  * @see jack_port_name_size(), jack_port_type_size()
@@ -1400,7 +1400,7 @@ void jack_set_info_function (void (*func)(const char *)) JACK_OPTIONAL_WEAK_EXPO
 
 /**
  * The free function to be used on memory returned by jack_port_get_connections,
- * jack_port_get_all_connections and jack_get_ports functions.
+ * jack_port_get_all_connections, jack_get_ports and jack_get_internal_client_name functions.
  * This is MANDATORY on Windows when otherwise all nasty runtime version related crashes can occur.
  * Developers are strongly encouraged to use this function instead of the standard "free" function in new code.
  *
diff --git a/example-clients/control.c b/example-clients/control.c
index f22307b6..619693ec 100644
--- a/example-clients/control.c
+++ b/example-clients/control.c
@@ -27,7 +27,7 @@ static int Jack_Graph_Order_Callback(void *arg)
         for (i = 0;  ports[i]; ++i) {
             printf("name: %s\n", ports[i]);
         }
-        free(ports);
+        jack_free(ports);
     }
 
     ports = jack_get_ports(client, NULL, NULL, JackPortIsPhysical|JackPortIsInput);
@@ -35,7 +35,7 @@ static int Jack_Graph_Order_Callback(void *arg)
         for (i = 0;  ports[i]; ++i) {
             printf("name: %s\n", ports[i]);
         }
-        free(ports);
+        jack_free(ports);
     }
 
     return 0;
diff --git a/example-clients/tw.c b/example-clients/tw.c
index 65317430..623ff240 100644
--- a/example-clients/tw.c
+++ b/example-clients/tw.c
@@ -231,7 +231,7 @@ main (int argc, char *argv[])
 		fprintf (stderr, "cannot connect input ports\n");
 	}
 
-	free (ports);
+	jack_free (ports);
 
 	ports = jack_get_ports (client, NULL, NULL,
 				JackPortIsPhysical|JackPortIsInput);
@@ -244,7 +244,7 @@ main (int argc, char *argv[])
 		fprintf (stderr, "cannot connect output ports\n");
 	}
 
-	free (ports);
+	jack_free (ports);
 
     /* install a signal handler to properly quits jack client */
     signal(SIGQUIT, signal_handler);
diff --git a/windows/JackWinNamedPipeServerChannel.h b/windows/JackWinNamedPipeServerChannel.h
index 0cc14129..891f0d5f 100644
--- a/windows/JackWinNamedPipeServerChannel.h
+++ b/windows/JackWinNamedPipeServerChannel.h
@@ -17,16 +17,13 @@
 
  */
 
-
 #ifndef __JackWinNamedPipeServerChannel__
 #define __JackWinNamedPipeServerChannel__
 
 #include "JackWinNamedPipe.h"
 #include "JackPlatformPlug.h"
 #include "JackConstants.h"
-
 #include "JackRequestDecoder.h"
-
 #include <list>
 
 namespace Jack