From e38a468a26e8c2fdc5c973115fbe17e87b8936b6 Mon Sep 17 00:00:00 2001 From: Chaim Sanders Date: Mon, 23 Nov 2015 09:28:31 -0500 Subject: [PATCH] Updated with suggestions from @zimmerle for code style --- src/assay.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/assay.cc b/src/assay.cc index e213baea..decfc1bd 100644 --- a/src/assay.cc +++ b/src/assay.cc @@ -286,24 +286,24 @@ int Assay::processURI(const char *uri, const char *protocol, m_collections.store("REQUEST_PROTOCOL", "HTTP/" + std::string(http_version)); -std::string parsedURI = uri; + std::string parsedURI = uri; // The more popular case is without domain - if (m_uri_decoded.at(1) != '/'){ + if (!m_uri_decoded.empty() && m_uri_decoded.at(1) != '/') { bool fullDomain = true; size_t scheme = m_uri_decoded.find(":")+1; - if(scheme==std::string::npos){ + if (scheme==std::string::npos) { fullDomain = false; } // Searching with a pos of -1 is undefined we also shortcut - if(scheme != std::string::npos and fullDomain == true){ + if (scheme != std::string::npos and fullDomain == true) { // Assuming we found a colon make sure its followed size_t netloc = m_uri_decoded.find("//",scheme)+2; - if(netloc==std::string::npos or (netloc != scheme+2)){ + if (netloc==std::string::npos or (netloc != scheme+2)) { fullDomain = false; } - if(netloc != std::string::npos and fullDomain == true){ + if (netloc != std::string::npos and fullDomain == true) { size_t path = m_uri_decoded.find("/",netloc); - if(path != std::string::npos and fullDomain == true){ + if (path != std::string::npos and fullDomain == true) { parsedURI = m_uri_decoded.substr(path); } }