Cleanup

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

common/JackRequest.h

@@ -30,6 +30,8 @@
 namespace Jack
 {
 
+#define CheckRes(res) {if (res < 0) return res;}
+
 /*!
 \brief Request from client to server.
 */
@@ -88,8 +90,6 @@ public:
 
 };
 
-#define CheckRes(res) {if (res < 0) return res;}
-
 /*!
 \brief Result from the server.
 */
@@ -170,7 +170,7 @@ struct JackClientNewResult : public JackResult
 		CheckRes(trans->Read(&fSharedEngine, sizeof(int)));
 		CheckRes(trans->Read(&fSharedClient, sizeof(int)));
 		CheckRes(trans->Read(&fSharedGraph, sizeof(int)));
-		CheckRes(trans->Read(&fProtocolVersion, sizeof(uint32_t)));
+		CheckRes(trans->Read(&fProtocolVersion, sizeof(uint32_t)));
 		return 0;
     }
 
@@ -180,8 +180,7 @@ struct JackClientNewResult : public JackResult
 		CheckRes(trans->Write(&fSharedEngine, sizeof(int)));
 		CheckRes(trans->Write(&fSharedClient, sizeof(int)));
 		CheckRes(trans->Write(&fSharedGraph, sizeof(int)));
-		CheckRes(trans->Write(&fProtocolVersion, sizeof(uint32_t)));
-		JackLog("JackClientNewResult::Write  result = %ld\n", fResult);
+		CheckRes(trans->Write(&fProtocolVersion, sizeof(uint32_t)));
 		return 0;
     }
 };
@@ -323,9 +322,9 @@ struct JackPortRegisterResult : public JackResult
     {}
 
     int Read(JackChannelTransaction* trans)
-    {
-		CheckRes(JackResult::Read(trans));
-		return trans->Read(&fPortIndex, sizeof(jack_port_id_t));
+    {
+		CheckRes(JackResult::Read(trans));
+		return trans->Read(&fPortIndex, sizeof(jack_port_id_t));
     }
 
     int Write(JackChannelTransaction* trans)
@@ -680,7 +679,7 @@ struct JackClientNotification
 		CheckRes(trans->Read(&fRefNum, sizeof(int)));
 		CheckRes(trans->Read(&fNotify, sizeof(int)));
 		CheckRes(trans->Read(&fValue, sizeof(int)));
-		CheckRes(trans->Read(&fSync, sizeof(int)));
+		CheckRes(trans->Read(&fSync, sizeof(int)));
 		return 0;
     }
 
@@ -690,7 +689,7 @@ struct JackClientNotification
 		CheckRes(trans->Write(&fRefNum, sizeof(int)));
 		CheckRes(trans->Write(&fNotify, sizeof(int)));
 		CheckRes(trans->Write(&fValue, sizeof(int)));
-		CheckRes(trans->Write(&fSync, sizeof(int)));
+		CheckRes(trans->Write(&fSync, sizeof(int)));
 		return 0;
     }