aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/httpfetch.h35
-rw-r--r--util/travis/clang-format-whitelist.txt2
2 files changed, 15 insertions, 22 deletions
diff --git a/src/httpfetch.h b/src/httpfetch.h
index d64b80b66..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();
@@ -77,24 +77,17 @@ struct HTTPFetchResult
unsigned long caller;
unsigned long request_id;
- HTTPFetchResult() :
- 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)
- {}
-
+ HTTPFetchResult()
+ : 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)
+ {
+ }
};
// Initializes the httpfetch module
@@ -124,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
diff --git a/util/travis/clang-format-whitelist.txt b/util/travis/clang-format-whitelist.txt
index b42291552..e9ff56cf5 100644
--- a/util/travis/clang-format-whitelist.txt
+++ b/util/travis/clang-format-whitelist.txt
@@ -39,6 +39,7 @@ src/content_cao.h
src/content_cso.cpp
src/content_cso.h
src/content_mapblock.cpp
+src/content_mapblock.h
src/content_mapnode.cpp
src/content_nodemeta.cpp
src/content_nodemeta.h
@@ -147,6 +148,7 @@ src/map_settings_manager.cpp
src/map_settings_manager.h
src/mesh.cpp
src/mesh.h
+src/mesh_generator_thread.cpp
src/metadata.h
src/mg_biome.cpp
src/mg_biome.h