From 0d527e2b83183fbf25aa31b5ee2427abaff87a0e Mon Sep 17 00:00:00 2001 From: yhirose Date: Fri, 25 Oct 2019 12:09:26 -0400 Subject: [PATCH] Code formatting --- httplib.h | 86 +++++++++++++++++++++++++++------------------------- test/test.cc | 32 ++++++++++--------- 2 files changed, 61 insertions(+), 57 deletions(-) diff --git a/httplib.h b/httplib.h index 120edc7..f73296a 100644 --- a/httplib.h +++ b/httplib.h @@ -52,6 +52,10 @@ #define CPPHTTPLIB_THREAD_POOL_COUNT 8 #endif +/* + * Headers + */ + #ifdef _WIN32 #ifndef _CRT_SECURE_NO_WARNINGS #define _CRT_SECURE_NO_WARNINGS @@ -61,10 +65,6 @@ #define _CRT_NONSTDC_NO_DEPRECATE #endif //_CRT_NONSTDC_NO_DEPRECATE -/* - * Headers - */ - #if defined(_MSC_VER) #ifdef _WIN64 typedef __int64 ssize_t; @@ -589,37 +589,45 @@ public: std::shared_ptr Head(const char *path, const Headers &headers); std::shared_ptr Post(const char *path, const std::string &body, - const char *content_type, bool compress = false); + const char *content_type, + bool compress = false); std::shared_ptr Post(const char *path, const Headers &headers, const std::string &body, const char *content_type, bool compress = false); - std::shared_ptr Post(const char *path, const Params ¶ms, bool compress = false); + std::shared_ptr Post(const char *path, const Params ¶ms, + bool compress = false); std::shared_ptr Post(const char *path, const Headers &headers, const Params ¶ms, bool compress = false); std::shared_ptr Post(const char *path, - const MultipartFormDataItems &items, bool compress = false); + const MultipartFormDataItems &items, + bool compress = false); std::shared_ptr Post(const char *path, const Headers &headers, - const MultipartFormDataItems &items, bool compress = false); + const MultipartFormDataItems &items, + bool compress = false); std::shared_ptr Put(const char *path, const std::string &body, - const char *content_type, bool compress = false); + const char *content_type, + bool compress = false); std::shared_ptr Put(const char *path, const Headers &headers, const std::string &body, - const char *content_type, bool compress = false); + const char *content_type, + bool compress = false); std::shared_ptr Patch(const char *path, const std::string &body, - const char *content_type, bool compress = false); + const char *content_type, + bool compress = false); std::shared_ptr Patch(const char *path, const Headers &headers, const std::string &body, - const char *content_type, bool compress = false); + const char *content_type, + bool compress = false); std::shared_ptr Delete(const char *path); @@ -3120,14 +3128,14 @@ inline std::shared_ptr Client::Head(const char *path, inline std::shared_ptr Client::Post(const char *path, const std::string &body, - const char *content_type, bool compress) { + const char *content_type, + bool compress) { return Post(path, Headers(), body, content_type, compress); } -inline std::shared_ptr Client::Post(const char *path, - const Headers &headers, - const std::string &body, - const char *content_type, bool compress) { +inline std::shared_ptr +Client::Post(const char *path, const Headers &headers, const std::string &body, + const char *content_type, bool compress) { Request req; req.method = "POST"; req.headers = headers; @@ -3137,9 +3145,7 @@ inline std::shared_ptr Client::Post(const char *path, req.body = body; if (compress) { - if (!detail::compress(req.body)) { - return nullptr; - } + if (!detail::compress(req.body)) { return nullptr; } req.headers.emplace("Content-Encoding", "gzip"); } @@ -3148,13 +3154,15 @@ inline std::shared_ptr Client::Post(const char *path, return send(req, *res) ? res : nullptr; } -inline std::shared_ptr Client::Post(const char *path, - const Params ¶ms, bool compress) { +inline std::shared_ptr +Client::Post(const char *path, const Params ¶ms, bool compress) { return Post(path, Headers(), params, compress); } -inline std::shared_ptr -Client::Post(const char *path, const Headers &headers, const Params ¶ms, bool compress) { +inline std::shared_ptr Client::Post(const char *path, + const Headers &headers, + const Params ¶ms, + bool compress) { std::string query; for (auto it = params.begin(); it != params.end(); ++it) { if (it != params.begin()) { query += "&"; } @@ -3163,11 +3171,13 @@ Client::Post(const char *path, const Headers &headers, const Params ¶ms, boo query += detail::encode_url(it->second); } - return Post(path, headers, query, "application/x-www-form-urlencoded", compress); + return Post(path, headers, query, "application/x-www-form-urlencoded", + compress); } inline std::shared_ptr -Client::Post(const char *path, const MultipartFormDataItems &items, bool compress) { +Client::Post(const char *path, const MultipartFormDataItems &items, + bool compress) { return Post(path, Headers(), items, compress); } @@ -3205,11 +3215,9 @@ inline std::shared_ptr Client::Put(const char *path, return Put(path, Headers(), body, content_type, compress); } -inline std::shared_ptr Client::Put(const char *path, - const Headers &headers, - const std::string &body, - const char *content_type, - bool compress) { +inline std::shared_ptr +Client::Put(const char *path, const Headers &headers, const std::string &body, + const char *content_type, bool compress) { Request req; req.method = "PUT"; req.headers = headers; @@ -3219,9 +3227,7 @@ inline std::shared_ptr Client::Put(const char *path, req.body = body; if (compress) { - if (!detail::compress(req.body)) { - return nullptr; - } + if (!detail::compress(req.body)) { return nullptr; } req.headers.emplace("Content-Encoding", "gzip"); } @@ -3237,11 +3243,9 @@ inline std::shared_ptr Client::Patch(const char *path, return Patch(path, Headers(), body, content_type, compress); } -inline std::shared_ptr Client::Patch(const char *path, - const Headers &headers, - const std::string &body, - const char *content_type, - bool compress) { +inline std::shared_ptr +Client::Patch(const char *path, const Headers &headers, const std::string &body, + const char *content_type, bool compress) { Request req; req.method = "PATCH"; req.headers = headers; @@ -3251,9 +3255,7 @@ inline std::shared_ptr Client::Patch(const char *path, req.body = body; if (compress) { - if (!detail::compress(req.body)) { - return nullptr; - } + if (!detail::compress(req.body)) { return nullptr; } req.headers.emplace("Content-Encoding", "gzip"); } diff --git a/test/test.cc b/test/test.cc index d34bc89..dd8a9ff 100644 --- a/test/test.cc +++ b/test/test.cc @@ -255,16 +255,16 @@ TEST(ChunkedEncodingTest, WithResponseHandlerAndContentReceiver) { #endif std::string body; - auto res = - cli.Get("/httpgallery/chunked/chunkedimage.aspx?0.4153841143030137", Headers(), - [&](const Response& response) { - EXPECT_EQ(200, response.status); - return true; - }, - [&](const char *data, size_t data_length, uint64_t, uint64_t) { - body.append(data, data_length); - return true; - }); + auto res = cli.Get( + "/httpgallery/chunked/chunkedimage.aspx?0.4153841143030137", Headers(), + [&](const Response &response) { + EXPECT_EQ(200, response.status); + return true; + }, + [&](const char *data, size_t data_length, uint64_t, uint64_t) { + body.append(data, data_length); + return true; + }); ASSERT_TRUE(res != nullptr); std::string out; @@ -539,7 +539,8 @@ TEST(YahooRedirectTest, Redirect) { TEST(HttpsToHttpRedirectTest, Redirect) { httplib::SSLClient cli("httpbin.org"); cli.follow_location(true); - auto res = cli.Get("/redirect-to?url=http%3A%2F%2Fwww.google.com&status_code=302"); + auto res = + cli.Get("/redirect-to?url=http%3A%2F%2Fwww.google.com&status_code=302"); ASSERT_TRUE(res != nullptr); } #endif @@ -636,7 +637,8 @@ protected: [data](uint64_t offset, uint64_t length, DataSink sink) { size_t DATA_CHUNK_SIZE = 4; const auto &d = *data; - auto out_len = std::min(static_cast(length), DATA_CHUNK_SIZE); + auto out_len = + std::min(static_cast(length), DATA_CHUNK_SIZE); sink(&d[static_cast(offset)], out_len); }, [data] { delete data; }); @@ -1422,19 +1424,19 @@ TEST_F(ServerTest, KeepAlive) { ASSERT_TRUE(requests.size() == responses.size()); for (int i = 0; i < 3; i++) { - auto& res = responses[i]; + auto &res = responses[i]; EXPECT_EQ(200, res.status); EXPECT_EQ("text/plain", res.get_header_value("Content-Type")); EXPECT_EQ("Hello World!", res.body); } { - auto& res = responses[3]; + auto &res = responses[3]; EXPECT_EQ(404, res.status); } { - auto& res = responses[4]; + auto &res = responses[4]; EXPECT_EQ(200, res.status); EXPECT_EQ("text/plain", res.get_header_value("Content-Type")); EXPECT_EQ("empty", res.body);