minetest
/
minetest
mirror of https://github.com/minetest/minetest.git
1
0
Fork 0
Code Issues Releases Wiki Activity

LINT fix

This commit is contained in:
Loic Blot 2017-04-23 10:24:00 +02:00
parent 485bf21998
commit dda171d292
No known key found for this signature in database
GPG Key ID: EFAA458E8C153987
2 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/httpfetch.h
View File

@ -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

2
util/travis/clang-format-whitelist.txt
View File

@ -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