Changeset 19 in cheroxy for trunk/src/CRXProxy.cpp

Timestamp:

11/08/12 17:12:01 (11 years ago)

Author:

cheese

Message:

#1 fix error on linux for r18

File:

• trunk/src/CRXProxy.cpp (modified) (7 diffs)

trunk/src/CRXProxy.cpp

@@ -8 +8 @@
 
 #include "CRXProxy.h"
+
+#include <string.h>
 
 #ifdef _DEBUG
@@ -30 +32 @@
 THREAD_FUNCTION_RETURN
 THREAD_FUNCTION_CALLING_CONVENTION
-CRXProxyWrapper (void * aProxy)
+CRXProxyWrapper (void * aThreadArg)
 {
-    return (THREAD_FUNCTION_RETURN)((CRXProxy *) aProxy)->Forward ();
+    int         aResult = 0;
+    CRXProxy    * aProxy = (CRXProxy *) aThreadArg;
+    
+    aResult = aProxy->Forward ();
+    if (aResult)
+        PRINT_ERROR << aProxy->GetErrorMessage ();
+
+    return (THREAD_FUNCTION_RETURN)0;
 }
 
@@ -83 +92 @@
         if (aResult < 0)
         {
+            CRX_ERROR_ADD (mClient.GetErrorMessage ().c_str ());
             CRX_ERROR (aResult, "failed to receive from browser");
-            PRINT_ERROR << mClient.GetErrorMessage() << GetErrorMessage();
             break;
         }
@@ -99 +108 @@
             if (aResult < 0)
             {
+                CRX_ERROR_ADD (aWebServer.GetErrorMessage ().c_str ());
                 CRX_ERROR (aResult, "failed to connect to server <%s>", aHttpRequest.GetURL ().c_str ());
-                PRINT_ERROR << aWebServer.GetErrorMessage() << GetErrorMessage();
                 return aResult;
             }
@@ -109 +118 @@
         if (aResult != aReceivedSize)
         {
+            CRX_ERROR_ADD (aWebServer.GetErrorMessage ().c_str ());
             CRX_ERROR (aResult, "failed to send to server <%s>", aHttpRequest.GetURL ().c_str ());
-            PRINT_ERROR << aWebServer.GetErrorMessage() << GetErrorMessage();
             return aResult;
         }
@@ -122 +131 @@
             if (aResult < 0)
             {
+                CRX_ERROR_ADD (aWebServer.GetErrorMessage ().c_str ());
                 CRX_ERROR (aResult, "failed to receive <%s>", aHttpRequest.GetURL ().c_str ());
-                PRINT_ERROR << aWebServer.GetErrorMessage() << GetErrorMessage();
                 break;
             }
@@ -135 +144 @@
             if (aResult != aReceivedSize)
             {
+                CRX_ERROR_ADD (mClient.GetErrorMessage ().c_str ());
                 CRX_ERROR (aResult, "failed to send <%s>", aHttpRequest.GetURL ().c_str ());
-                PRINT_ERROR << mClient.GetErrorMessage() << GetErrorMessage();
                 break;
             }