From 2baef566303e65cb570c3f1787100feb31e1ef42 Mon Sep 17 00:00:00 2001 From: marcelb Date: Mon, 30 Oct 2023 17:54:37 +0100 Subject: [PATCH] Add my namespace --- lib/api.hpp | 5 +++++ lib/elementary.hpp | 6 ++++++ lib/http.hpp | 4 ++++ src/api.cpp | 4 ++-- src/elementary.cpp | 6 ++++-- src/http.cpp | 26 ++++++++++++++------------ test/test.cpp | 3 ++- test/test.o | Bin 117680 -> 117968 bytes 8 files changed, 37 insertions(+), 17 deletions(-) diff --git a/lib/api.hpp b/lib/api.hpp index 712c216..24f078a 100644 --- a/lib/api.hpp +++ b/lib/api.hpp @@ -9,6 +9,8 @@ // #include "elementary.hpp" #include "http.hpp" +namespace marcelb { + using namespace std; class http_request; @@ -28,4 +30,7 @@ class api { api(const http_request _req); }; + +} + #endif diff --git a/lib/elementary.hpp b/lib/elementary.hpp index 23b002a..ac870d3 100644 --- a/lib/elementary.hpp +++ b/lib/elementary.hpp @@ -2,6 +2,9 @@ #define _HTTP_ELMY_ #include + +namespace marcelb { + using namespace std; typedef enum { @@ -109,4 +112,7 @@ typedef enum { string http_response_code_txt(uint code); + +} + #endif \ No newline at end of file diff --git a/lib/http.hpp b/lib/http.hpp index c0a5eca..c7b8f06 100644 --- a/lib/http.hpp +++ b/lib/http.hpp @@ -8,6 +8,8 @@ #include "elementary.hpp" #include "api.hpp" +namespace marcelb { + using namespace std; class api; @@ -60,4 +62,6 @@ class http_response { static string set_protcol(const string _protocol); +} + #endif diff --git a/src/api.cpp b/src/api.cpp index 9dda409..4a4f805 100644 --- a/src/api.cpp +++ b/src/api.cpp @@ -1,6 +1,6 @@ #include "../lib/api.hpp" -api::api(const http_method _method, const string _path, const map _params, const string _body) { +marcelb::api::api(const http_method _method, const string _path, const map _params, const string _body) { method = http_method_to_str(_method); path = _path; url = path; @@ -17,7 +17,7 @@ api::api(const http_method _method, const string _path, const mapmethod; url = _api->url; body = _api->body; @@ -16,12 +18,12 @@ http_request::http_request(const api *_api, const string _protocol) { mold(); } -http_request::http_request(const string _raw) { +marcelb::http_request::http_request(const string _raw) { raw = _raw; parse(); } -void http_request::parse() { +void marcelb::http_request::parse() { if (raw.empty()) { return; @@ -48,12 +50,12 @@ void http_request::parse() { } -void http_request::putheader(const string _key, const string _value) { +void marcelb::http_request::putheader(const string _key, const string _value) { headers[_key] = _value; mold(); } -void http_request::setheaders(const map _headers) { +void marcelb::http_request::setheaders(const map _headers) { headers = _headers; mold(); } @@ -62,7 +64,7 @@ void http_request::setheaders(const map _headers) { * http zahtjev formiranje raw */ -void http_request::mold() { +void marcelb::http_request::mold() { raw = method.empty() ? "GET" : method; raw += " " + url + " HTTP/1.1\r\n"; @@ -76,7 +78,7 @@ void http_request::mold() { raw += "\r\n" + body; } -http_response::http_response(const http_response_code _status, const string _body, const string _protocol) { +marcelb::http_response::http_response(const http_response_code _status, const string _body, const string _protocol) { status = to_string(_status) + " " + http_response_code_txt(_status); body = _body; protocol = set_protcol(_protocol); @@ -84,7 +86,7 @@ http_response::http_response(const http_response_code _status, const string _bod } -http_response::http_response(const string _raw) { +marcelb::http_response::http_response(const string _raw) { raw = _raw; parse(); } @@ -94,7 +96,7 @@ http_response::http_response(const string _raw) { */ -void http_response::mold() { +void marcelb::http_response::mold() { raw = protocol + " " + status + "\r\n"; //"HTTP/1.1 200 OK\r\n"; // implementirati status if (!headers.empty()) { raw += '?'; @@ -107,7 +109,7 @@ void http_response::mold() { } -void http_response::parse() { +void marcelb::http_response::parse() { if (raw.empty()) { return; @@ -136,7 +138,7 @@ void http_response::parse() { } -static string set_protcol(const string _protocol) { +static string marcelb::set_protcol(const string _protocol) { string protocol; if (_protocol == "1.0" || _protocol == "1.1" || _protocol == "2.0") { protocol = "HTTP/" + _protocol; diff --git a/test/test.cpp b/test/test.cpp index aca7c14..b4b7ca3 100644 --- a/test/test.cpp +++ b/test/test.cpp @@ -3,6 +3,7 @@ #include "../lib/api.hpp" using namespace std; +using namespace marcelb; int main() { @@ -21,7 +22,7 @@ int main() { cout << myres.body << endl; - http_response myres2(OK, "nnotauth", "1.0" ); + http_response myres2(OK, "notauth", "1.0" ); cout << myres2.protocol << endl; cout << myres2.status << endl; // cout << myres2.headers << endl; diff --git a/test/test.o b/test/test.o index 29cc6bf64d819865788f03f133717e1fab7c1c6f..864b3e25e089ab4bee296be51040d5b33e5e761d 100755 GIT binary patch delta 8044 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 U$2YYw=Y2WeG5Zv3dSAx;KWBMf(EtDd delta 7709 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 H0q*=?4+iMN