Changeset 20 in cheroxy

Timestamp:

11/08/12 17:19:07 (11 years ago)

Author:

cheese

Message:

#1 fix and arrange exception handling

Location:

trunk

Files:

• include/CRXProxy.h (modified) (1 diff)
• src/CRXProxy.cpp (modified) (6 diffs)
• src/main.cpp (modified) (1 diff)

trunk/include/CRXProxy.h

@@ -12 +12 @@
 {
 private:
-    CRXSocket   mClient;
+    CRXSocket           mClient;
 
 public:
-    CRXProxy                (const int aSocket = 0);
+    CRXProxy            (const int aSocket = 0);
 
 public:
-    int         Forward     (void);
-    int         ForwardMT   (void);
+    static CRXProxy *   GetNewInstance  (const int aSocket = 0);
+
+public:
+    int                 Forward         (void);
+    int                 ForwardMT       (void);
 };
 

trunk/src/CRXProxy.cpp

@@ -51 +51 @@
 }
 
+CRXProxy *
+CRXProxy::GetNewInstance(const int aSocket)
+{
+    return new(std::nothrow) CRXProxy (aSocket);
+}
+
 int
 CRXProxy::ForwardMT (void)
@@ -93 +99 @@
         {
             CRX_ERROR_ADD (mClient.GetErrorMessage ().c_str ());
-            CRX_ERROR (aResult, "failed to receive from browser");
+            CRX_ERROR (aResult, "Failed to receive from browser");
             break;
         }
@@ -109 +115 @@
             {
                 CRX_ERROR_ADD (aWebServer.GetErrorMessage ().c_str ());
-                CRX_ERROR (aResult, "failed to connect to server <%s>", aHttpRequest.GetURL ().c_str ());
+                CRX_ERROR (aResult, "Failed to connect to server <%s>", aHttpRequest.GetURL ().c_str ());
                 return aResult;
             }
@@ -119 +125 @@
         {
             CRX_ERROR_ADD (aWebServer.GetErrorMessage ().c_str ());
-            CRX_ERROR (aResult, "failed to send to server <%s>", aHttpRequest.GetURL ().c_str ());
+            CRX_ERROR (aResult, "Failed to send to server <%s>", aHttpRequest.GetURL ().c_str ());
             return aResult;
         }
@@ -132 +138 @@
             {
                 CRX_ERROR_ADD (aWebServer.GetErrorMessage ().c_str ());
-                CRX_ERROR (aResult, "failed to receive <%s>", aHttpRequest.GetURL ().c_str ());
+                CRX_ERROR (aResult, "Failed to receive <%s>", aHttpRequest.GetURL ().c_str ());
                 break;
             }
@@ -145 +151 @@
             {
                 CRX_ERROR_ADD (mClient.GetErrorMessage ().c_str ());
-                CRX_ERROR (aResult, "failed to send <%s>", aHttpRequest.GetURL ().c_str ());
+                CRX_ERROR (aResult, "Failed to send <%s>", aHttpRequest.GetURL ().c_str ());
                 break;
             }

trunk/src/main.cpp

@@ -60 +60 @@
         }
 
-        if ((aProxy = new(std::nothrow) CRXProxy (aResult)) == NULL)
+        if ((aProxy = CRXProxy::GetNewInstance (aResult)) == NULL)
         {
             aResult = -1;