Run clang-format

Author: davidalo

httplib.h

@@ -2449,7 +2449,7 @@ ssize_t send_socket(socket_t sock, const void *ptr, size_t size, int flags);
 
 ssize_t read_socket(socket_t sock, void *ptr, size_t size, int flags);
 
-enum class EncodingType { None = 0, Gzip, Brotli, Zstd};
+enum class EncodingType { None = 0, Gzip, Brotli, Zstd };
 
 EncodingType encoding_type(const Request &req, const Response &res);
 
@@ -4201,63 +4201,49 @@ inline zstd_compressor::zstd_compressor() {
   ZSTD_CCtx_setParameter(ctx_, ZSTD_c_compressionLevel, ZSTD_fast);
 }
 
-inline zstd_compressor::~zstd_compressor() {
-  ZSTD_freeCCtx(ctx_);
-}
+inline zstd_compressor::~zstd_compressor() { ZSTD_freeCCtx(ctx_); }
 
 inline bool zstd_compressor::compress(const char *data, size_t data_length,
                                       bool last, Callback callback) {
   std::array<char, CPPHTTPLIB_COMPRESSION_BUFSIZ> buff{};
 
   ZSTD_EndDirective mode = last ? ZSTD_e_end : ZSTD_e_continue;
-  ZSTD_inBuffer input = { data, data_length, 0 };
+  ZSTD_inBuffer input = {data, data_length, 0};
 
   bool finished;
   do {
-    ZSTD_outBuffer output = { buff.data(), CPPHTTPLIB_COMPRESSION_BUFSIZ, 0 };
+    ZSTD_outBuffer output = {buff.data(), CPPHTTPLIB_COMPRESSION_BUFSIZ, 0};
     size_t const remaining = ZSTD_compressStream2(ctx_, &output, &input, mode);
 
-    if (ZSTD_isError(remaining)) {
-      return false;
-    }
+    if (ZSTD_isError(remaining)) { return false; }
 
-    if (!callback(buff.data(), output.pos)) {
-      return false;
-    }
+    if (!callback(buff.data(), output.pos)) { return false; }
 
     finished = last ? (remaining == 0) : (input.pos == input.size);
 
-  } while(!finished);
+  } while (!finished);
 
   return true;
 }
 
-inline zstd_decompressor::zstd_decompressor() {
-  ctx_ = ZSTD_createDCtx();
-}
+inline zstd_decompressor::zstd_decompressor() { ctx_ = ZSTD_createDCtx(); }
 
-inline zstd_decompressor::~zstd_decompressor() {
-  ZSTD_freeDCtx(ctx_);
-}
+inline zstd_decompressor::~zstd_decompressor() { ZSTD_freeDCtx(ctx_); }
 
 inline bool zstd_decompressor::is_valid() const { return ctx_ != nullptr; }
 
 inline bool zstd_decompressor::decompress(const char *data, size_t data_length,
                                           Callback callback) {
   std::array<char, CPPHTTPLIB_COMPRESSION_BUFSIZ> buff{};
-  ZSTD_inBuffer input = { data, data_length, 0 };
+  ZSTD_inBuffer input = {data, data_length, 0};
 
   while (input.pos < input.size) {
-    ZSTD_outBuffer output = { buff.data(), CPPHTTPLIB_COMPRESSION_BUFSIZ, 0 };
-    size_t const remaining = ZSTD_decompressStream(ctx_, &output , &input);
+    ZSTD_outBuffer output = {buff.data(), CPPHTTPLIB_COMPRESSION_BUFSIZ, 0};
+    size_t const remaining = ZSTD_decompressStream(ctx_, &output, &input);
 
-    if (ZSTD_isError(remaining)) {
-      return false;
-    }
+    if (ZSTD_isError(remaining)) { return false; }
 
-    if (!callback(buff.data(), output.pos)) {
-      return false;
-    }
+    if (!callback(buff.data(), output.pos)) { return false; }
   }
 
   return true;
@@ -10506,4 +10492,4 @@ inline SSL_CTX *Client::ssl_context() const {
 
 } // namespace httplib
 
-#endif // CPPHTTPLIB_HTTPLIB_H
+#endif // CPPHTTPLIB_HTTPLIB_H

test/test.cc

@@ -688,7 +688,8 @@ TEST(ParseAcceptEncoding2, AcceptEncoding) {
 
 TEST(ParseAcceptEncoding3, AcceptEncoding) {
   Request req;
-  req.set_header("Accept-Encoding", "br;q=1.0, gzip;q=0.8, zstd;q=0.8, *;q=0.1");
+  req.set_header("Accept-Encoding",
+                 "br;q=1.0, gzip;q=0.8, zstd;q=0.8, *;q=0.1");
 
   Response res;
   res.set_header("Content-Type", "text/plain");
@@ -3011,7 +3012,8 @@ class ServerTest : public ::testing::Test {
                    const httplib::ContentReader &) {
                   res.set_content("ok", "text/plain");
                 })
-#if defined(CPPHTTPLIB_ZLIB_SUPPORT) || defined(CPPHTTPLIB_BROTLI_SUPPORT) || defined(CPPHTTPLIB_ZSTD_SUPPORT)
+#if defined(CPPHTTPLIB_ZLIB_SUPPORT) || defined(CPPHTTPLIB_BROTLI_SUPPORT) ||  \
+    defined(CPPHTTPLIB_ZSTD_SUPPORT)
         .Get("/compress",
              [&](const Request & /*req*/, Response &res) {
                res.set_content(
@@ -4991,20 +4993,19 @@ TEST_F(ServerTest, ZstdWithoutDecompressing) {
   cli_.set_decompress(false);
   auto res = cli_.Get("/compress", headers);
 
-  unsigned char compressed[26] = {
-      0x28, 0xb5, 0x2f, 0xfd, 0x20, 0x64, 0x8d, 0x00,
-      0x00, 0x50, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36,
-      0x37, 0x38, 0x39, 0x30, 0x01, 0x00, 0xd7, 0xa9,
-      0x20, 0x01
-  };
+  unsigned char compressed[26] = {0x28, 0xb5, 0x2f, 0xfd, 0x20, 0x64, 0x8d,
+                                  0x00, 0x00, 0x50, 0x31, 0x32, 0x33, 0x34,
+                                  0x35, 0x36, 0x37, 0x38, 0x39, 0x30, 0x01,
+                                  0x00, 0xd7, 0xa9, 0x20, 0x01};
 
   ASSERT_TRUE(res);
   EXPECT_EQ("zstd", res->get_header_value("Content-Encoding"));
   EXPECT_EQ("text/plain", res->get_header_value("Content-Type"));
   EXPECT_EQ("26", res->get_header_value("Content-Length"));
   EXPECT_EQ(StatusCode::OK_200, res->status);
   ASSERT_EQ(26U, res->body.size());
-  EXPECT_TRUE(std::memcmp(compressed, res->body.data(), sizeof(compressed)) == 0);
+  EXPECT_TRUE(std::memcmp(compressed, res->body.data(), sizeof(compressed)) ==
+              0);
 }
 
 TEST_F(ServerTest, ZstdWithContentReceiverWithoutAcceptEncoding) {
@@ -5074,7 +5075,6 @@ TEST_F(ServerTest, MultipartFormDataZstd) {
   Headers headers;
   headers.emplace("Accept-Encoding", "zstd");
 
-  
   cli_.set_compress(true);
   auto res = cli_.Post("/compress-multipart", headers, items);
 
@@ -5085,7 +5085,7 @@ TEST_F(ServerTest, MultipartFormDataZstd) {
 TEST_F(ServerTest, PutWithContentProviderWithZstd) {
   Headers headers;
   headers.emplace("Accept-Encoding", "zstd");
-  
+
   cli_.set_compress(true);
   auto res = cli_.Put(
       "/put", headers, 3,
@@ -5148,12 +5148,10 @@ TEST(ZstdDecompressor, ChunkedDecompression) {
 
 TEST(ZstdDecompressor, Decompress) {
   std::string original_text = "Compressed with ZSTD";
-  unsigned char data[29] = {
-      0x28, 0xb5, 0x2f, 0xfd, 0x20, 0x14, 0xa1, 0x00,
-      0x00, 0x43, 0x6f, 0x6d, 0x70, 0x72, 0x65, 0x73,
-      0x73, 0x65, 0x64, 0x20, 0x77, 0x69, 0x74, 0x68,
-      0x20, 0x5a, 0x53, 0x54, 0x44
-  };
+  unsigned char data[29] = {0x28, 0xb5, 0x2f, 0xfd, 0x20, 0x14, 0xa1, 0x00,
+                            0x00, 0x43, 0x6f, 0x6d, 0x70, 0x72, 0x65, 0x73,
+                            0x73, 0x65, 0x64, 0x20, 0x77, 0x69, 0x74, 0x68,
+                            0x20, 0x5a, 0x53, 0x54, 0x44};
   std::string compressed_data(data, data + sizeof(data) / sizeof(data[0]));
 
   std::string decompressed_data;