From ed0719f2bcb5fd7a3f7a52f304316a1c20851fbb Mon Sep 17 00:00:00 2001 From: yhirose Date: Tue, 6 Aug 2024 07:20:05 -0400 Subject: [PATCH] Code format --- httplib.h | 75 +++++++++++++++++++++++++++------------------- test/test.cc | 85 +++++++++++++++++++++++++++------------------------- 2 files changed, 90 insertions(+), 70 deletions(-) diff --git a/httplib.h b/httplib.h index c7c395f..2aefc4b 100644 --- a/httplib.h +++ b/httplib.h @@ -728,7 +728,7 @@ private: } #ifdef CPPHTTPLIB_OPENSSL_SUPPORT - OPENSSL_thread_stop (); + OPENSSL_thread_stop(); #endif } @@ -1824,9 +1824,9 @@ public: bool is_valid() const override; SSL_CTX *ssl_context() const; - - void update_certs (X509 *cert, EVP_PKEY *private_key, - X509_STORE *client_ca_cert_store = nullptr); + + void update_certs(X509 *cert, EVP_PKEY *private_key, + X509_STORE *client_ca_cert_store = nullptr); private: bool process_and_close_socket(socket_t sock) override; @@ -2824,7 +2824,9 @@ inline bool mmap::open(const char *path) { wpath += path[i]; } -#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_SYSTEM | WINAPI_PARTITION_GAMES) && (_WIN32_WINNT >= _WIN32_WINNT_WIN8) +#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_SYSTEM | \ + WINAPI_PARTITION_GAMES) && \ + (_WIN32_WINNT >= _WIN32_WINNT_WIN8) hFile_ = ::CreateFile2(wpath.c_str(), GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING, NULL); #else @@ -2834,7 +2836,8 @@ inline bool mmap::open(const char *path) { if (hFile_ == INVALID_HANDLE_VALUE) { return false; } -#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_SYSTEM | WINAPI_PARTITION_GAMES) +#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_SYSTEM | \ + WINAPI_PARTITION_GAMES) LARGE_INTEGER size{}; if (!::GetFileSizeEx(hFile_, &size)) { return false; } size_ = static_cast(size.QuadPart); @@ -2846,13 +2849,13 @@ inline bool mmap::open(const char *path) { size_ = (static_cast(sizeHigh) << (sizeof(DWORD) * 8)) | sizeLow; #endif -#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_SYSTEM) && (_WIN32_WINNT >= _WIN32_WINNT_WIN8) +#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_SYSTEM) && \ + (_WIN32_WINNT >= _WIN32_WINNT_WIN8) hMapping_ = ::CreateFileMappingFromApp(hFile_, NULL, PAGE_READONLY, size_, NULL); #else - hMapping_ = - ::CreateFileMappingW(hFile_, NULL, PAGE_READONLY, size.HighPart, - size.LowPart, NULL); + hMapping_ = ::CreateFileMappingW(hFile_, NULL, PAGE_READONLY, size.HighPart, + size.LowPart, NULL); #endif if (hMapping_ == NULL) { @@ -2860,7 +2863,8 @@ inline bool mmap::open(const char *path) { return false; } -#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_SYSTEM) && (_WIN32_WINNT >= _WIN32_WINNT_WIN8) +#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_SYSTEM) && \ + (_WIN32_WINNT >= _WIN32_WINNT_WIN8) addr_ = ::MapViewOfFileFromApp(hMapping_, FILE_MAP_READ, 0, 0); #else addr_ = ::MapViewOfFile(hMapping_, FILE_MAP_READ, 0, 0, 0); @@ -8185,7 +8189,8 @@ inline Result ClientImpl::Patch(const std::string &path, inline Result ClientImpl::Patch(const std::string &path, const std::string &body, - const std::string &content_type, Progress progress) { + const std::string &content_type, + Progress progress) { return Patch(path, Headers(), body, content_type, progress); } @@ -8784,17 +8789,17 @@ inline bool SSLServer::is_valid() const { return ctx_; } inline SSL_CTX *SSLServer::ssl_context() const { return ctx_; } -inline void SSLServer::update_certs (X509 *cert, EVP_PKEY *private_key, - X509_STORE *client_ca_cert_store) { +inline void SSLServer::update_certs(X509 *cert, EVP_PKEY *private_key, + X509_STORE *client_ca_cert_store) { - std::lock_guard guard(ctx_mutex_); + std::lock_guard guard(ctx_mutex_); - SSL_CTX_use_certificate (ctx_, cert); - SSL_CTX_use_PrivateKey (ctx_, private_key); + SSL_CTX_use_certificate(ctx_, cert); + SSL_CTX_use_PrivateKey(ctx_, private_key); - if (client_ca_cert_store != nullptr) { - SSL_CTX_set_cert_store (ctx_, client_ca_cert_store); - } + if (client_ca_cert_store != nullptr) { + SSL_CTX_set_cert_store(ctx_, client_ca_cert_store); + } } inline bool SSLServer::process_and_close_socket(socket_t sock) { @@ -9579,7 +9584,8 @@ inline Result Client::Patch(const std::string &path, const char *body, } inline Result Client::Patch(const std::string &path, const char *body, size_t content_length, - const std::string &content_type, Progress progress) { + const std::string &content_type, + Progress progress) { return cli_->Patch(path, body, content_length, content_type, progress); } inline Result Client::Patch(const std::string &path, const Headers &headers, @@ -9589,15 +9595,18 @@ inline Result Client::Patch(const std::string &path, const Headers &headers, } inline Result Client::Patch(const std::string &path, const Headers &headers, const char *body, size_t content_length, - const std::string &content_type, Progress progress) { - return cli_->Patch(path, headers, body, content_length, content_type, progress); + const std::string &content_type, + Progress progress) { + return cli_->Patch(path, headers, body, content_length, content_type, + progress); } inline Result Client::Patch(const std::string &path, const std::string &body, const std::string &content_type) { return cli_->Patch(path, body, content_type); } inline Result Client::Patch(const std::string &path, const std::string &body, - const std::string &content_type, Progress progress) { + const std::string &content_type, + Progress progress) { return cli_->Patch(path, body, content_type, progress); } inline Result Client::Patch(const std::string &path, const Headers &headers, @@ -9607,7 +9616,8 @@ inline Result Client::Patch(const std::string &path, const Headers &headers, } inline Result Client::Patch(const std::string &path, const Headers &headers, const std::string &body, - const std::string &content_type, Progress progress) { + const std::string &content_type, + Progress progress) { return cli_->Patch(path, headers, body, content_type, progress); } inline Result Client::Patch(const std::string &path, size_t content_length, @@ -9646,7 +9656,8 @@ inline Result Client::Delete(const std::string &path, const char *body, } inline Result Client::Delete(const std::string &path, const char *body, size_t content_length, - const std::string &content_type, Progress progress) { + const std::string &content_type, + Progress progress) { return cli_->Delete(path, body, content_length, content_type, progress); } inline Result Client::Delete(const std::string &path, const Headers &headers, @@ -9656,15 +9667,18 @@ inline Result Client::Delete(const std::string &path, const Headers &headers, } inline Result Client::Delete(const std::string &path, const Headers &headers, const char *body, size_t content_length, - const std::string &content_type, Progress progress) { - return cli_->Delete(path, headers, body, content_length, content_type, progress); + const std::string &content_type, + Progress progress) { + return cli_->Delete(path, headers, body, content_length, content_type, + progress); } inline Result Client::Delete(const std::string &path, const std::string &body, const std::string &content_type) { return cli_->Delete(path, body, content_type); } inline Result Client::Delete(const std::string &path, const std::string &body, - const std::string &content_type, Progress progress) { + const std::string &content_type, + Progress progress) { return cli_->Delete(path, body, content_type, progress); } inline Result Client::Delete(const std::string &path, const Headers &headers, @@ -9674,7 +9688,8 @@ inline Result Client::Delete(const std::string &path, const Headers &headers, } inline Result Client::Delete(const std::string &path, const Headers &headers, const std::string &body, - const std::string &content_type, Progress progress) { + const std::string &content_type, + Progress progress) { return cli_->Delete(path, headers, body, content_type, progress); } inline Result Client::Options(const std::string &path) { diff --git a/test/test.cc b/test/test.cc index 446e7f9..df69d4a 100644 --- a/test/test.cc +++ b/test/test.cc @@ -59,10 +59,9 @@ TEST(ClientTest, MoveConstructible) { EXPECT_TRUE(std::is_nothrow_move_constructible::value); } -TEST(ClientTest, MoveAssignable) -{ - EXPECT_FALSE(std::is_copy_assignable::value); - EXPECT_TRUE(std::is_nothrow_move_assignable::value); +TEST(ClientTest, MoveAssignable) { + EXPECT_FALSE(std::is_copy_assignable::value); + EXPECT_TRUE(std::is_nothrow_move_assignable::value); } #ifdef _WIN32 @@ -1755,32 +1754,34 @@ TEST(BindServerTest, BindAndListenSeparatelySSLEncryptedKey) { #endif #ifdef CPPHTTPLIB_OPENSSL_SUPPORT -X509* readCertificate (const std::string& strFileName) { - std::ifstream inStream (strFileName); - std::string strCertPEM ((std::istreambuf_iterator(inStream)), std::istreambuf_iterator()); +X509 *readCertificate(const std::string &strFileName) { + std::ifstream inStream(strFileName); + std::string strCertPEM((std::istreambuf_iterator(inStream)), + std::istreambuf_iterator()); - if (strCertPEM.empty ()) return (nullptr); + if (strCertPEM.empty()) return (nullptr); - BIO* pbCert = BIO_new (BIO_s_mem ()); - BIO_write (pbCert, strCertPEM.c_str (), (int)strCertPEM.size ()); - X509* pCert = PEM_read_bio_X509 (pbCert, NULL, 0, NULL); - BIO_free (pbCert); + BIO *pbCert = BIO_new(BIO_s_mem()); + BIO_write(pbCert, strCertPEM.c_str(), (int)strCertPEM.size()); + X509 *pCert = PEM_read_bio_X509(pbCert, NULL, 0, NULL); + BIO_free(pbCert); - return (pCert); + return (pCert); } -EVP_PKEY* readPrivateKey (const std::string& strFileName) { - std::ifstream inStream (strFileName); - std::string strPrivateKeyPEM ((std::istreambuf_iterator(inStream)), std::istreambuf_iterator()); +EVP_PKEY *readPrivateKey(const std::string &strFileName) { + std::ifstream inStream(strFileName); + std::string strPrivateKeyPEM((std::istreambuf_iterator(inStream)), + std::istreambuf_iterator()); - if (strPrivateKeyPEM.empty ()) return (nullptr); + if (strPrivateKeyPEM.empty()) return (nullptr); - BIO* pbPrivKey = BIO_new (BIO_s_mem ()); - BIO_write (pbPrivKey, strPrivateKeyPEM.c_str (), (int) strPrivateKeyPEM.size ()); - EVP_PKEY* pPrivateKey = PEM_read_bio_PrivateKey (pbPrivKey, NULL, NULL, NULL); - BIO_free (pbPrivKey); + BIO *pbPrivKey = BIO_new(BIO_s_mem()); + BIO_write(pbPrivKey, strPrivateKeyPEM.c_str(), (int)strPrivateKeyPEM.size()); + EVP_PKEY *pPrivateKey = PEM_read_bio_PrivateKey(pbPrivKey, NULL, NULL, NULL); + BIO_free(pbPrivKey); - return (pPrivateKey); + return (pPrivateKey); } TEST(BindServerTest, UpdateCerts) { @@ -1789,26 +1790,26 @@ TEST(BindServerTest, UpdateCerts) { ASSERT_TRUE(svr.is_valid()); ASSERT_TRUE(port > 0); - X509* cert = readCertificate (SERVER_CERT_FILE); - X509* ca_cert = readCertificate (CLIENT_CA_CERT_FILE); - EVP_PKEY* key = readPrivateKey (SERVER_PRIVATE_KEY_FILE); + X509 *cert = readCertificate(SERVER_CERT_FILE); + X509 *ca_cert = readCertificate(CLIENT_CA_CERT_FILE); + EVP_PKEY *key = readPrivateKey(SERVER_PRIVATE_KEY_FILE); - ASSERT_TRUE(cert != nullptr); + ASSERT_TRUE(cert != nullptr); ASSERT_TRUE(ca_cert != nullptr); - ASSERT_TRUE(key != nullptr); + ASSERT_TRUE(key != nullptr); - X509_STORE* cert_store = X509_STORE_new (); + X509_STORE *cert_store = X509_STORE_new(); - X509_STORE_add_cert (cert_store, ca_cert); + X509_STORE_add_cert(cert_store, ca_cert); - svr.update_certs (cert, key, cert_store); + svr.update_certs(cert, key, cert_store); ASSERT_TRUE(svr.is_valid()); svr.stop(); - X509_free (cert); - X509_free (ca_cert); - EVP_PKEY_free (key); + X509_free(cert); + X509_free(ca_cert); + EVP_PKEY_free(key); } #endif @@ -2357,8 +2358,8 @@ protected: }) .Get("/with-range-customized-response", [&](const Request & /*req*/, Response &res) { - res.status = StatusCode::BadRequest_400; - res.set_content(JSON_DATA, "application/json"); + res.status = StatusCode::BadRequest_400; + res.set_content(JSON_DATA, "application/json"); }) .Post("/chunked", [&](const Request &req, Response & /*res*/) { @@ -3480,8 +3481,10 @@ TEST_F(ServerTest, GetStreamedWithRangeError) { } TEST_F(ServerTest, GetRangeWithMaxLongLength) { - auto res = - cli_.Get("/with-range", {{"Range", "bytes=0-" + std::to_string(std::numeric_limits::max())}}); + auto res = cli_.Get( + "/with-range", + {{"Range", + "bytes=0-" + std::to_string(std::numeric_limits::max())}}); EXPECT_EQ(StatusCode::RangeNotSatisfiable_416, res->status); EXPECT_EQ("0", res->get_header_value("Content-Length")); EXPECT_EQ(false, res->has_header("Content-Range")); @@ -3637,7 +3640,8 @@ TEST_F(ServerTest, GetWithRangeMultipartOffsetGreaterThanContent) { } TEST_F(ServerTest, GetWithRangeCustomizedResponse) { - auto res = cli_.Get("/with-range-customized-response", {{make_range_header({{1, 2}})}}); + auto res = cli_.Get("/with-range-customized-response", + {{make_range_header({{1, 2}})}}); ASSERT_TRUE(res); EXPECT_EQ(StatusCode::BadRequest_400, res->status); EXPECT_EQ(true, res->has_header("Content-Length")); @@ -3646,7 +3650,8 @@ TEST_F(ServerTest, GetWithRangeCustomizedResponse) { } TEST_F(ServerTest, GetWithRangeMultipartCustomizedResponseMultipleRange) { - auto res = cli_.Get("/with-range-customized-response", {{make_range_header({{1, 2}, {4, 5}})}}); + auto res = cli_.Get("/with-range-customized-response", + {{make_range_header({{1, 2}, {4, 5}})}}); ASSERT_TRUE(res); EXPECT_EQ(StatusCode::BadRequest_400, res->status); EXPECT_EQ(true, res->has_header("Content-Length")); @@ -7450,6 +7455,6 @@ TEST(UniversalClientImplTest, Ipv6LiteralAddress) { std::string ipV6TestURL = "http://[ff06::c3]"; Client cli(ipV6TestURL + ":" + std::to_string(port), CLIENT_CERT_FILE, - CLIENT_PRIVATE_KEY_FILE); + CLIENT_PRIVATE_KEY_FILE); EXPECT_EQ(cli.port(), port); }