LocalPlayer::accelerateHorizontal: cleanups

[oweals/minetest.git] / src / httpfetch.h

diff --git a/src/httpfetch.h b/src/httpfetch.h
index 50a4c93d81cf3079be8f69d95f16c10264ba59ec..5a673d7e6ec9824d92dbf226d074f8544ceafa54 100644 (file)
--- a/src/httpfetch.h
+++ b/src/httpfetch.h
@@ -20,9 +20,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef HTTPFETCH_HEADER
 #define HTTPFETCH_HEADER
 
-#include <string>
 #include <vector>
-#include <map>
+#include "util/string.h"
 #include "config.h"
 
 // Can be used in place of "caller" in asynchronous transfers to discard result
@@ -32,15 +31,15 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 struct HTTPFetchRequest
 {
-       std::string url;
+       std::string url = "";
 
        // Identifies the caller (for asynchronous requests)
        // Ignored by httpfetch_sync
-       unsigned long caller;
+       unsigned long caller = HTTPFETCH_DISCARD;
 
        // Some number that identifies the request
        // (when the same caller issues multiple httpfetch_async calls)
-       unsigned long request_id;
+       unsigned long request_id = 0;
 
        // Timeout for the whole transfer, in milliseconds
        long timeout;
@@ -50,11 +49,11 @@ struct HTTPFetchRequest
 
        // Indicates if this is multipart/form-data or
        // application/x-www-form-urlencoded.  POST-only.
-       bool multipart;
+       bool multipart = false;
 
        // POST fields.  Fields are escaped properly.
        // If this is empty a GET request is done instead.
-       std::map<std::string, std::string> post_fields;
+       StringMap post_fields;
 
        // Raw POST data, overrides post_fields.
        std::string post_data;
@@ -62,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();
@@ -70,34 +69,20 @@ struct HTTPFetchRequest
 
 struct HTTPFetchResult
 {
-       bool succeeded;
-       bool timeout;
-       long response_code;
-       std::string data;
+       bool succeeded = false;
+       bool timeout = false;
+       long response_code = 0;
+       std::string data = "";
        // The caller and request_id from the corresponding HTTPFetchRequest.
-       unsigned long caller;
-       unsigned long request_id;
+       unsigned long caller = HTTPFETCH_DISCARD;
+       unsigned long request_id = 0;
 
-       HTTPFetchResult()
-       {
-               succeeded = false;
-               timeout = false;
-               response_code = 0;
-               data = "";
-               caller = HTTPFETCH_DISCARD;
-               request_id = 0;
-       }
+       HTTPFetchResult() {}
 
        HTTPFetchResult(const HTTPFetchRequest &fetch_request)
+           : 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
@@ -117,6 +102,9 @@ bool httpfetch_async_get(unsigned long caller, HTTPFetchResult &fetch_result);
 // Not required if you want to set caller = HTTPFETCH_DISCARD
 unsigned long httpfetch_caller_alloc();
 
+// Allocates a non-predictable caller ID for httpfetch_async
+unsigned long httpfetch_caller_alloc_secure();
+
 // Frees a caller ID allocated with httpfetch_caller_alloc
 // Note: This can be expensive, because the httpfetch thread is told
 // to stop any ongoing fetches for the given caller.
@@ -124,8 +112,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