From 41852d019c1f3ec52a030e4f061051f26d296234 Mon Sep 17 00:00:00 2001 From: Brad Arant Date: Mon, 16 Nov 2020 17:00:28 -0800 Subject: [PATCH] Sync. --- IMFHeader.cpp | 12 ++++++------ IMFMessage.cpp | 11 +---------- IMFMessage.h | 6 +----- IMFRequest.cpp | 5 ----- IMFRequest.h | 2 -- 5 files changed, 8 insertions(+), 28 deletions(-) diff --git a/IMFHeader.cpp b/IMFHeader.cpp index e87c5b0..fe5a3c7 100644 --- a/IMFHeader.cpp +++ b/IMFHeader.cpp @@ -4,7 +4,7 @@ namespace coreutils { IMFHeader::IMFHeader() { - + } IMFHeader::IMFHeader(PString &in) { @@ -19,14 +19,14 @@ namespace coreutils { value = in.str(); } else if(in.skipWhitespace() > 0) { - - - + + + } else if(in.str() == "") { - + } - + } IMFHeader::IMFHeader(std::string key, std::string value) { diff --git a/IMFMessage.cpp b/IMFMessage.cpp index 78ea512..2fa882b 100644 --- a/IMFMessage.cpp +++ b/IMFMessage.cpp @@ -8,10 +8,9 @@ namespace coreutils { IMFMessage::IMFMessage() { body = NULL; - first = true; } - IMFMessage::IMFMessage(PString &in) : IMFMessage() { + IMFMessage::IMFMessage(PString &in) { parse(in); } @@ -19,14 +18,6 @@ namespace coreutils { coreutils::Log(coreutils::LOG_DEBUG_4) << "parse [" << in.str() << "]"; - if(first) { - if(in.str().find(" ") != std::string::npos) { - parse(in); - first = false; - return true; - } - } - if(in.str() != "") { headers.emplace_back(in); return true; diff --git a/IMFMessage.h b/IMFMessage.h index 243adbf..512134d 100644 --- a/IMFMessage.h +++ b/IMFMessage.h @@ -25,14 +25,10 @@ namespace coreutils { IMFBody *getBody(); - protected: - IMFRequest request; +// protected: std::vector headers; IMFBody *body; - private: - bool first = true; - }; } diff --git a/IMFRequest.cpp b/IMFRequest.cpp index 166111b..5ee7b2b 100644 --- a/IMFRequest.cpp +++ b/IMFRequest.cpp @@ -7,12 +7,7 @@ namespace coreutils { IMFRequest::IMFRequest() {} IMFRequest::IMFRequest(PString &in) { - parse(in); - } - - bool IMFRequest::parse(PString &in) { parts = in.split(" "); - return parts.size() == 3; } std::string IMFRequest::getMethod() { diff --git a/IMFRequest.h b/IMFRequest.h index 0ac6b20..4a36128 100644 --- a/IMFRequest.h +++ b/IMFRequest.h @@ -11,8 +11,6 @@ namespace coreutils { IMFRequest(); IMFRequest(PString &in); - bool parse(PString &in); - std::string getMethod(); std::string getURI(); std::string getProtocol();