diff options
author | ShadowNinja <shadowninja@minetest.net> | 2017-06-03 14:55:10 -0400 |
---|---|---|
committer | ShadowNinja <shadowninja@minetest.net> | 2017-06-03 14:55:10 -0400 |
commit | caecdb681c428c1aab9c0f7eec2570c0460f995c (patch) | |
tree | e5115982ea59bbf2343ba9b35bc4a0cfbb56f407 /src/httpfetch.h | |
parent | 81d56b94919dceb7b2e51d70b21a7ca22f852bd5 (diff) | |
parent | 80dc961d24e1964e25d57039ddb2ba639f9f4d22 (diff) | |
download | minetest-caecdb681c428c1aab9c0f7eec2570c0460f995c.tar.gz minetest-caecdb681c428c1aab9c0f7eec2570c0460f995c.tar.bz2 minetest-caecdb681c428c1aab9c0f7eec2570c0460f995c.zip |
Merge 0.4.16 into stable-0.4
Diffstat (limited to 'src/httpfetch.h')
-rw-r--r-- | src/httpfetch.h | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/src/httpfetch.h b/src/httpfetch.h index f57ed8789..29fb540d0 100644 --- a/src/httpfetch.h +++ b/src/httpfetch.h @@ -61,7 +61,7 @@ struct HTTPFetchRequest // If not empty, should contain entries such as "Accept: text/html" std::vector<std::string> extra_headers; - //useragent to use + // useragent to use std::string useragent; HTTPFetchRequest(); @@ -78,25 +78,16 @@ struct HTTPFetchResult unsigned long request_id; HTTPFetchResult() + : succeeded(false), timeout(false), response_code(0), data(""), + caller(HTTPFETCH_DISCARD), request_id(0) { - succeeded = false; - timeout = false; - response_code = 0; - data = ""; - caller = HTTPFETCH_DISCARD; - request_id = 0; } HTTPFetchResult(const HTTPFetchRequest &fetch_request) + : succeeded(false), timeout(false), response_code(0), data(""), + caller(fetch_request.caller), request_id(fetch_request.request_id) { - succeeded = false; - timeout = false; - response_code = 0; - data = ""; - caller = fetch_request.caller; - request_id = fetch_request.request_id; } - }; // Initializes the httpfetch module @@ -126,8 +117,6 @@ void httpfetch_caller_free(unsigned long caller); // Performs a synchronous HTTP request. This blocks and therefore should // only be used from background threads. -void httpfetch_sync(const HTTPFetchRequest &fetch_request, - HTTPFetchResult &fetch_result); - +void httpfetch_sync(const HTTPFetchRequest &fetch_request, HTTPFetchResult &fetch_result); #endif // !HTTPFETCH_HEADER |