Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
LINT fix
  • Loading branch information
nerzhul committed Apr 23, 2017
1 parent 485bf21 commit dda171d
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 22 deletions.
35 changes: 13 additions & 22 deletions src/httpfetch.h
Expand Up @@ -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();
Expand All @@ -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
Expand Down Expand Up @@ -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 changes: 2 additions & 0 deletions util/travis/clang-format-whitelist.txt
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit dda171d

Please sign in to comment.