Moved http_endpoint to subdir details

Sebastiano Merlino · Sebastiano Merlino · commit e40eccfb12c3 · 2014-01-25T13:16:11.000Z
Aligned with its namespace
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -21,7 +21,7 @@ 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
-nobase_include_HEADERS = httpserver.hpp httpserver/create_webserver.hpp httpserver/webserver.hpp httpserver/http_utils.hpp httpserver/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
+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
 libhttpserver_la_LDFLAGS =
diff --git a/src/http_endpoint.cpp b/src/http_endpoint.cpp
@@ -14,11 +14,11 @@
 
      You should have received a copy of the GNU Lesser General Public
      License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 
+     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
      USA
 */
 
-#include "http_endpoint.hpp"
+#include "details/http_endpoint.hpp"
 #include "http_utils.hpp"
 #include "string_utilities.hpp"
 
@@ -67,7 +67,7 @@ http_endpoint::http_endpoint
     {
         for(unsigned int i = 0; i< parts.size(); i++)
         {
-            if((parts[i] != "") && (parts[i][0] != '{')) 
+            if((parts[i] != "") && (parts[i][0] != '{'))
             {
                 if(first)
                 {
@@ -85,14 +85,14 @@ http_endpoint::http_endpoint
                 {
                     this->url_modded += "/" + parts[i];
                 }
-            } 
-            else 
+            }
+            else
             {
                 if(
-                    (parts[i].size() >= 3) && 
-                    (parts[i][0] == '{') && 
-                    (parts[i][parts[i].size() - 1] == '}') 
-                ) 
+                    (parts[i].size() >= 3) &&
+                    (parts[i][0] == '{') &&
+                    (parts[i][parts[i].size() - 1] == '}')
+                )
                 {
                     int bar = parts[i].find_first_of('|');
                     if(bar != (int)string::npos)
@@ -128,8 +128,8 @@ http_endpoint::http_endpoint
                         }
                     }
                     this->chunk_positions.push_back(i);
-                } 
-                else 
+                }
+                else
                 {
                     throw bad_http_endpoint();
                 }
@@ -156,7 +156,7 @@ http_endpoint::http_endpoint
     if(use_regex)
     {
         this->url_modded += "$";
-        regcomp(&(this->re_url_modded), url_modded.c_str(), 
+        regcomp(&(this->re_url_modded), url_modded.c_str(),
                 REG_EXTENDED|REG_ICASE|REG_NOSUB
         );
         reg_compiled = true;
@@ -173,7 +173,7 @@ http_endpoint::http_endpoint(const http_endpoint& h):
     reg_compiled(h.reg_compiled)
 {
     if(this->reg_compiled)
-        regcomp(&(this->re_url_modded), url_modded.c_str(), 
+        regcomp(&(this->re_url_modded), url_modded.c_str(),
                 REG_EXTENDED|REG_ICASE|REG_NOSUB
         );
 }
@@ -185,7 +185,7 @@ http_endpoint& http_endpoint::operator =(const http_endpoint& h)
     this->family_url = h.family_url;
     this->reg_compiled = h.reg_compiled;
     if(this->reg_compiled)
-        regcomp(&(this->re_url_modded), url_modded.c_str(), 
+        regcomp(&(this->re_url_modded), url_modded.c_str(),
                 REG_EXTENDED|REG_ICASE|REG_NOSUB
         );
     this->url_pars = h.url_pars;
@@ -194,12 +194,12 @@ http_endpoint& http_endpoint::operator =(const http_endpoint& h)
     return *this;
 }
 
-bool http_endpoint::operator <(const http_endpoint& b) const 
+bool http_endpoint::operator <(const http_endpoint& b) const
 {
     COMPARATOR(this->url_modded, b.url_modded, toupper);
 }
 
-bool http_endpoint::match(const http_endpoint& url) const 
+bool http_endpoint::match(const http_endpoint& url) const
 {
     if(this->family_url && (url.url_pieces.size() >= this->url_pieces.size()))
     {
@@ -220,7 +220,7 @@ bool http_endpoint::match(const http_endpoint& url) const
         return regexec(&(this->re_url_modded), nn.c_str(), 0, NULL, 0) == 0;
     }
     else
-        return regexec(&(this->re_url_modded), 
+        return regexec(&(this->re_url_modded),
                 url.url_modded.c_str(), 0, NULL, 0) == 0;
 }
 
diff --git a/src/httpserver.hpp b/src/httpserver.hpp
@@ -4,7 +4,7 @@
 #define _HTTPSERVER_HPP_INSIDE_
 
 #include "httpserver/http_utils.hpp"
-#include "httpserver/http_endpoint.hpp"
+#include "httpserver/details/http_endpoint.hpp"
 #include "httpserver/http_resource.hpp"
 #include "httpserver/http_response.hpp"
 #include "httpserver/http_request.hpp"
diff --git a/src/httpserver/details/http_endpoint.hpp b/src/httpserver/details/http_endpoint.hpp
diff --git a/src/webserver.cpp b/src/webserver.cpp
@@ -39,7 +39,7 @@
 #include "http_resource.hpp"
 #include "http_response.hpp"
 #include "http_request.hpp"
-#include "http_endpoint.hpp"
+#include "details/http_endpoint.hpp"
 #include "string_utilities.hpp"
 #include "details/http_resource_mirror.hpp"
 #include "details/event_tuple.hpp"

Original file line number	Diff line number	Diff line change
`@@ -14,11 +14,11 @@`
`14`	`14`
`15`	`15`	`You should have received a copy of the GNU Lesser General Public`
`16`	`16`	`License along with this library; if not, write to the Free Software`
`17`		`- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301`
	`17`	`+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301`
`18`	`18`	`USA`
`19`	`19`	`*/`
`20`	`20`
`21`		`-#include "http_endpoint.hpp"`
	`21`	`+#include "details/http_endpoint.hpp"`
`22`	`22`	`#include "http_utils.hpp"`
`23`	`23`	`#include "string_utilities.hpp"`
`24`	`24`
`@@ -67,7 +67,7 @@ http_endpoint::http_endpoint`
`67`	`67`	`{`
`68`	`68`	`for(unsigned int i = 0; i< parts.size(); i++)`
`69`	`69`	`{`
`70`		`- if((parts[i] != "") && (parts[i][0] != '{'))`
	`70`	`+ if((parts[i] != "") && (parts[i][0] != '{'))`
`71`	`71`	`{`
`72`	`72`	`if(first)`
`73`	`73`	`{`
`@@ -85,14 +85,14 @@ http_endpoint::http_endpoint`
`85`	`85`	`{`
`86`	`86`	`this->url_modded += "/" + parts[i];`
`87`	`87`	`}`
`88`		`- }`
`89`		`- else`
	`88`	`+ }`
	`89`	`+ else`
`90`	`90`	`{`
`91`	`91`	`if(`
`92`		`- (parts[i].size() >= 3) &&`
`93`		`- (parts[i][0] == '{') &&`
`94`		`- (parts[i][parts[i].size() - 1] == '}')`
`95`		`- )`
	`92`	`+ (parts[i].size() >= 3) &&`
	`93`	`+ (parts[i][0] == '{') &&`
	`94`	`+ (parts[i][parts[i].size() - 1] == '}')`
	`95`	`+ )`
`96`	`96`	`{`
`97`	`97`	`int bar = parts[i].find_first_of('\|');`
`98`	`98`	`if(bar != (int)string::npos)`
`@@ -128,8 +128,8 @@ http_endpoint::http_endpoint`
`128`	`128`	`}`
`129`	`129`	`}`
`130`	`130`	`this->chunk_positions.push_back(i);`
`131`		`- }`
`132`		`- else`
	`131`	`+ }`
	`132`	`+ else`
`133`	`133`	`{`
`134`	`134`	`throw bad_http_endpoint();`
`135`	`135`	`}`
`@@ -156,7 +156,7 @@ http_endpoint::http_endpoint`
`156`	`156`	`if(use_regex)`
`157`	`157`	`{`
`158`	`158`	`this->url_modded += "$";`
`159`		`- regcomp(&(this->re_url_modded), url_modded.c_str(),`
	`159`	`+ regcomp(&(this->re_url_modded), url_modded.c_str(),`
`160`	`160`	`REG_EXTENDED\|REG_ICASE\|REG_NOSUB`
`161`	`161`	`);`
`162`	`162`	`reg_compiled = true;`
`@@ -173,7 +173,7 @@ http_endpoint::http_endpoint(const http_endpoint& h):`
`173`	`173`	`reg_compiled(h.reg_compiled)`
`174`	`174`	`{`
`175`	`175`	`if(this->reg_compiled)`
`176`		`- regcomp(&(this->re_url_modded), url_modded.c_str(),`
	`176`	`+ regcomp(&(this->re_url_modded), url_modded.c_str(),`
`177`	`177`	`REG_EXTENDED\|REG_ICASE\|REG_NOSUB`
`178`	`178`	`);`
`179`	`179`	`}`
`@@ -185,7 +185,7 @@ http_endpoint& http_endpoint::operator =(const http_endpoint& h)`
`185`	`185`	`this->family_url = h.family_url;`
`186`	`186`	`this->reg_compiled = h.reg_compiled;`
`187`	`187`	`if(this->reg_compiled)`
`188`		`- regcomp(&(this->re_url_modded), url_modded.c_str(),`
	`188`	`+ regcomp(&(this->re_url_modded), url_modded.c_str(),`
`189`	`189`	`REG_EXTENDED\|REG_ICASE\|REG_NOSUB`
`190`	`190`	`);`
`191`	`191`	`this->url_pars = h.url_pars;`
`@@ -194,12 +194,12 @@ http_endpoint& http_endpoint::operator =(const http_endpoint& h)`
`194`	`194`	`return *this;`
`195`	`195`	`}`
`196`	`196`
`197`		`-bool http_endpoint::operator <(const http_endpoint& b) const`
	`197`	`+bool http_endpoint::operator <(const http_endpoint& b) const`
`198`	`198`	`{`
`199`	`199`	`COMPARATOR(this->url_modded, b.url_modded, toupper);`
`200`	`200`	`}`
`201`	`201`
`202`		`-bool http_endpoint::match(const http_endpoint& url) const`
	`202`	`+bool http_endpoint::match(const http_endpoint& url) const`
`203`	`203`	`{`
`204`	`204`	`if(this->family_url && (url.url_pieces.size() >= this->url_pieces.size()))`
`205`	`205`	`{`
`@@ -220,7 +220,7 @@ bool http_endpoint::match(const http_endpoint& url) const`
`220`	`220`	`return regexec(&(this->re_url_modded), nn.c_str(), 0, NULL, 0) == 0;`
`221`	`221`	`}`
`222`	`222`	`else`
`223`		`- return regexec(&(this->re_url_modded),`
	`223`	`+ return regexec(&(this->re_url_modded),`
`224`	`224`	`url.url_modded.c_str(), 0, NULL, 0) == 0;`
`225`	`225`	`}`
`226`	`226`