From 8f7785771b9e02b1a1daf7a252550d78ea93053d Mon Sep 17 00:00:00 2001 From: Loïc Blot Date: Sat, 17 Jun 2017 19:11:28 +0200 Subject: Cpp11 initializers 2 (#5999) * C++11 patchset 10: continue cleanup on constructors * Drop obsolete bool MainMenuData::enable_public (setting is called with cURL in server loop) * More classes cleanup * More classes cleanup + change NULL tests to boolean tests --- src/httpfetch.h | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) (limited to 'src/httpfetch.h') diff --git a/src/httpfetch.h b/src/httpfetch.h index 29fb540d0..5a673d7e6 100644 --- a/src/httpfetch.h +++ b/src/httpfetch.h @@ -31,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; @@ -49,7 +49,7 @@ 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. @@ -69,23 +69,18 @@ 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) - : succeeded(false), timeout(false), response_code(0), data(""), - caller(fetch_request.caller), request_id(fetch_request.request_id) + : caller(fetch_request.caller), request_id(fetch_request.request_id) { } }; -- cgit v1.2.3