Extracted modded_request and http_response_ptr from webserver.cpp

This improves readability

Author: Sebastiano Merlino

src/Makefile.am

@@ -20,7 +20,7 @@ INCLUDES = -I../ -I$(srcdir)/httpserver/
 METASOURCES = AUTO
 lib_LTLIBRARIES = libhttpserver.la
 libhttpserver_la_SOURCES = string_utilities.cpp webserver.cpp http_utils.cpp http_endpoint.cpp http_request.cpp http_response.cpp http_resource.cpp
-noinst_HEADERS = httpserver/string_utilities.hpp gettext.h
+noinst_HEADERS = httpserver/string_utilities.hpp httpserver/details/modded_request.hpp httpserver/details/http_response_ptr.hpp gettext.h
 nobase_include_HEADERS = httpserver.hpp httpserver/create_webserver.hpp httpserver/webserver.hpp httpserver/http_utils.hpp httpserver/details/http_endpoint.hpp httpserver/http_request.hpp httpserver/http_response.hpp httpserver/http_resource.hpp httpserver/binders.hpp httpserver/event_supplier.hpp httpserver/details/event_tuple.hpp httpserver/details/http_resource_mirror.hpp
 AM_CXXFLAGS += -fPIC -Wall
 libhttpserver_la_LIBADD = -lmicrohttpd

src/httpserver/details/http_response_ptr.hpp

@@ -0,0 +1,91 @@
+namespace httpserver
+{
+
+class webserver;
+
+namespace details
+{
+
+struct http_response_ptr
+{
+    public:
+        http_response_ptr():
+            res(0x0),
+            num_references(0x0)
+        {
+            num_references = new int(0);
+        }
+        http_response_ptr(http_response* res):
+            res(res),
+            num_references(0x0)
+        {
+            num_references = new int(0);
+        }
+        http_response_ptr(const http_response_ptr& b):
+            res(b.res),
+            num_references(b.num_references)
+        {
+            (*num_references)++;
+        }
+        ~http_response_ptr()
+        {
+            if(num_references)
+            {
+                if((*num_references) == 0)
+                {
+                    if(res && res->autodelete)
+                    {
+                        delete res;
+                        res = 0x0;
+                    }
+                    delete num_references;
+                }
+                else
+                    (*num_references)--;
+            }
+        }
+        http_response& operator* ()
+        {
+            return *res;
+        }
+        http_response* operator-> ()
+        {
+            return res;
+        }
+        http_response* ptr()
+        {
+            return res;
+        }
+        http_response_ptr& operator= (const http_response_ptr& b)
+        {
+            if( this != &b)
+            {
+                if(num_references)
+                {
+                    if((*num_references) == 0)
+                    {
+                        if(res && res->autodelete)
+                        {
+                            delete res;
+                            res = 0x0;
+                        }
+                        delete num_references;
+                    }
+                    else
+                        (*num_references)--;
+                }
+
+                res = b.res;
+                num_references = b.num_references;
+                (*num_references)++;
+            }
+            return *this;
+        }
+    private:
+        http_response* res;
+        int* num_references;
+        friend class ::httpserver::webserver;
+};
+
+} //details
+} //httpserver

src/httpserver/details/modded_request.hpp

@@ -0,0 +1,51 @@
+#include "binders.hpp"
+#include "details/http_response_ptr.hpp"
+
+namespace httpserver
+{
+
+namespace details
+{
+
+struct modded_request
+{
+    struct MHD_PostProcessor *pp;
+    std::string* complete_uri;
+    std::string* standardized_url;
+    webserver* ws;
+
+    const binders::functor_two<
+        const http_request&, http_response**, void
+    > http_resource_mirror::*callback;
+
+    http_request* dhr;
+    http_response_ptr dhrs;
+    bool second;
+
+    modded_request():
+        pp(0x0),
+        complete_uri(0x0),
+        standardized_url(0x0),
+        ws(0x0),
+        dhr(0x0),
+        dhrs(0x0),
+        second(false)
+    {
+    }
+    ~modded_request()
+    {
+        if (NULL != pp)
+        {
+            MHD_destroy_post_processor (pp);
+        }
+        if(second)
+            delete dhr; //TODO: verify. It could be an error
+        delete complete_uri;
+        delete standardized_url;
+    }
+
+};
+
+} //details
+
+} //httpserver

src/webserver.cpp

@@ -45,6 +45,7 @@
 #include "details/event_tuple.hpp"
 #include "create_webserver.hpp"
 #include "webserver.hpp"
+#include "details/modded_request.hpp"
 
 #define _REENTRANT 1
 
@@ -75,126 +76,6 @@ struct daemon_item
     }
 };
 
-struct http_response_ptr
-{
-    public:
-        http_response_ptr():
-            res(0x0),
-            num_references(0x0)
-        {
-            num_references = new int(0);
-        }
-        http_response_ptr(http_response* res):
-            res(res),
-            num_references(0x0)
-        {
-            num_references = new int(0);
-        }
-        http_response_ptr(const http_response_ptr& b):
-            res(b.res),
-            num_references(b.num_references)
-        {
-            (*num_references)++;
-        }
-        ~http_response_ptr()
-        {
-            if(num_references)
-            {
-                if((*num_references) == 0)
-                {
-                    if(res && res->autodelete)
-                    {
-                        delete res;
-                        res = 0x0;
-                    }
-                    delete num_references;
-                }
-                else
-                    (*num_references)--;
-            }
-        }
-        http_response& operator* ()
-        {
-            return *res;
-        }
-        http_response* operator-> ()
-        {
-            return res;
-        }
-        http_response* ptr()
-        {
-            return res;
-        }
-        http_response_ptr& operator= (const http_response_ptr& b)
-        {
-            if( this != &b)
-            {
-                if(num_references)
-                {
-                    if((*num_references) == 0)
-                    {
-                        if(res && res->autodelete)
-                        {
-                            delete res;
-                            res = 0x0;
-                        }
-                        delete num_references;
-                    }
-                    else
-                        (*num_references)--;
-                }
-
-                res = b.res;
-                num_references = b.num_references;
-                (*num_references)++;
-            }
-            return *this;
-        }
-    private:
-        http_response* res;
-        int* num_references;
-        friend class ::httpserver::webserver;
-};
-
-struct modded_request
-{
-    struct MHD_PostProcessor *pp;
-    std::string* complete_uri;
-    std::string* standardized_url;
-    webserver* ws;
-
-    const binders::functor_two<
-        const http_request&, http_response**, void
-    > http_resource_mirror::*callback;
-
-    http_request* dhr;
-    http_response_ptr dhrs;
-    bool second;
-
-    modded_request():
-        pp(0x0),
-        complete_uri(0x0),
-        standardized_url(0x0),
-        ws(0x0),
-        dhr(0x0),
-        dhrs(0x0),
-        second(false)
-    {
-    }
-    ~modded_request()
-    {
-        if (NULL != pp)
-        {
-            MHD_destroy_post_processor (pp);
-        }
-        if(second)
-            delete dhr; //TODO: verify. It could be an error
-        delete complete_uri;
-        delete standardized_url;
-    }
-
-};
-
 void empty_render(const http_request& r, http_response** res)
 {
     *res = new http_string_response("", 200);