diff options
author | Thiago Marcos P. Santos <thiago@mapbox.com> | 2015-10-26 17:07:10 +0200 |
---|---|---|
committer | Thiago Marcos P. Santos <thiago@mapbox.com> | 2015-10-26 18:37:51 +0200 |
commit | c65f809651dccc742d4d549f4dedf794de8623fc (patch) | |
tree | b35ea2ac1181b098405f586ec5596f13402c92c3 /platform | |
parent | 75dec6ffac6f3e79e5a173cd8a3f98d374ed1c09 (diff) | |
download | qtlocation-mapboxgl-c65f809651dccc742d4d549f4dedf794de8623fc.tar.gz |
[core] Move parseCacheControl() up in the class hierarchy
Avoid duplicating it on all the ports.
Diffstat (limited to 'platform')
-rw-r--r-- | platform/android/http_request_android.cpp | 16 | ||||
-rw-r--r-- | platform/darwin/http_request_nsurl.mm | 15 | ||||
-rw-r--r-- | platform/default/http_request_curl.cpp | 16 |
3 files changed, 0 insertions, 47 deletions
diff --git a/platform/android/http_request_android.cpp b/platform/android/http_request_android.cpp index 6e44db4b13..b909c22128 100644 --- a/platform/android/http_request_android.cpp +++ b/platform/android/http_request_android.cpp @@ -2,7 +2,6 @@ #include <mbgl/storage/http_request_base.hpp> #include <mbgl/storage/resource.hpp> #include <mbgl/storage/response.hpp> -#include <mbgl/util/chrono.hpp> #include <mbgl/platform/log.hpp> #include <mbgl/android/jni.hpp> @@ -248,21 +247,6 @@ void HTTPAndroidRequest::finish() { delete this; } -int64_t parseCacheControl(const char *value) { - if (value) { - unsigned long long seconds = 0; - // TODO: cache-control may contain other information as well: - // http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9 - if (std::sscanf(value, "max-age=%llu", &seconds) == 1) { - return std::chrono::duration_cast<std::chrono::seconds>( - std::chrono::system_clock::now().time_since_epoch()).count() + - seconds; - } - } - - return 0; -} - void HTTPAndroidRequest::onResponse(int code, std::string message, std::string etag, std::string modified, std::string cacheControl, std::string expires, std::string body) { if (!response) { response = std::make_unique<Response>(); diff --git a/platform/darwin/http_request_nsurl.mm b/platform/darwin/http_request_nsurl.mm index f5a4d8ef97..59f3c6b71a 100644 --- a/platform/darwin/http_request_nsurl.mm +++ b/platform/darwin/http_request_nsurl.mm @@ -198,21 +198,6 @@ void HTTPNSURLRequest::cancel() { } } -int64_t parseCacheControl(const char *value) { - if (value) { - unsigned long long seconds = 0; - // TODO: cache-control may contain other information as well: - // http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9 - if (std::sscanf(value, "max-age=%llu", &seconds) == 1) { - return std::chrono::duration_cast<std::chrono::seconds>( - std::chrono::system_clock::now().time_since_epoch()).count() + - seconds; - } - } - - return 0; -} - void HTTPNSURLRequest::handleResult(NSData *data, NSURLResponse *res, NSError *error) { if (error) { if ([error code] == NSURLErrorCancelled) { diff --git a/platform/default/http_request_curl.cpp b/platform/default/http_request_curl.cpp index 2d80f0b60a..efc4efadf7 100644 --- a/platform/default/http_request_curl.cpp +++ b/platform/default/http_request_curl.cpp @@ -2,7 +2,6 @@ #include <mbgl/storage/http_request_base.hpp> #include <mbgl/storage/resource.hpp> #include <mbgl/storage/response.hpp> -#include <mbgl/util/chrono.hpp> #include <mbgl/platform/log.hpp> #include <mbgl/util/time.hpp> @@ -541,21 +540,6 @@ size_t headerMatches(const char *const header, const char *const buffer, const s return i == headerLength ? i : std::string::npos; } -int64_t parseCacheControl(const char *value) { - if (value) { - unsigned long long seconds = 0; - // TODO: cache-control may contain other information as well: - // http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9 - if (std::sscanf(value, "max-age=%llu", &seconds) == 1) { - return std::chrono::duration_cast<std::chrono::seconds>( - SystemClock::now().time_since_epoch()).count() + - seconds; - } - } - - return 0; -} - size_t HTTPCURLRequest::headerCallback(char *const buffer, const size_t size, const size_t nmemb, void *userp) { assert(userp); auto baton = reinterpret_cast<HTTPCURLRequest *>(userp); |