Reformat lines with clang-format-3.5

examples/asio-sv.cc

@@ -42,8 +42,7 @@
 using namespace nghttp2::asio_http2;
 using namespace nghttp2::asio_http2::server;
 
-int main(int argc, char* argv[])
-{
+int main(int argc, char *argv[]) {
   try {
     // Check command line arguments.
     if (argc < 3) {
@@ -59,19 +58,16 @@ int main(int argc, char* argv[])
 
     server.num_threads(num_threads);
 
-    if(argc >= 5) {
+    if (argc >= 5) {
       server.tls(argv[3], argv[4]);
     }
 
-    server.listen
-      ("*", port,
-       [](const std::shared_ptr<request>& req,
-          const std::shared_ptr<response>& res)
-       {
-         res->write_head(200, { header{ "foo", "bar" } });
-         res->end("hello, world");
-       });
-  } catch (std::exception& e) {
+    server.listen("*", port, [](const std::shared_ptr<request> &req,
+                                const std::shared_ptr<response> &res) {
+      res->write_head(200, {header{"foo", "bar"}});
+      res->end("hello, world");
+    });
+  } catch (std::exception &e) {
     std::cerr << "exception: " << e.what() << "\n";
   }
 

examples/asio-sv2.cc

@@ -45,8 +45,7 @@
 using namespace nghttp2::asio_http2;
 using namespace nghttp2::asio_http2::server;
 
-int main(int argc, char* argv[])
-{
+int main(int argc, char *argv[]) {
   try {
     // Check command line arguments.
     if (argc < 4) {
@@ -63,47 +62,44 @@ int main(int argc, char* argv[])
 
     server.num_threads(num_threads);
 
-    if(argc >= 6) {
+    if (argc >= 6) {
       server.tls(argv[4], argv[5]);
     }
 
-    server.listen
-      ("*", port,
-       [&docroot](const std::shared_ptr<request>& req,
-                  const std::shared_ptr<response>& res)
-       {
-         auto path = percent_decode(req->path());
-         if(!check_path(path)) {
-           res->write_head(404);
-           res->end();
-           return;
-         }
+    server.listen("*", port, [&docroot](const std::shared_ptr<request> &req,
+                                        const std::shared_ptr<response> &res) {
+      auto path = percent_decode(req->path());
+      if (!check_path(path)) {
+        res->write_head(404);
+        res->end();
+        return;
+      }
 
-         if(path == "/") {
-           path = "/index.html";
-         }
+      if (path == "/") {
+        path = "/index.html";
+      }
 
-         path = docroot + path;
-         auto fd = open(path.c_str(), O_RDONLY);
-         if(fd == -1) {
-           res->write_head(404);
-           res->end();
-           return;
-         }
+      path = docroot + path;
+      auto fd = open(path.c_str(), O_RDONLY);
+      if (fd == -1) {
+        res->write_head(404);
+        res->end();
+        return;
+      }
 
-         auto headers = std::vector<header>();
+      auto headers = std::vector<header>();
 
-         struct stat stbuf;
-         if(stat(path.c_str(), &stbuf) == 0) {
-           headers.push_back
-             (header{"content-length", std::to_string(stbuf.st_size)});
-           headers.push_back
-             (header{"last-modified", http_date(stbuf.st_mtim.tv_sec)});
-         }
-         res->write_head(200, std::move(headers));
-         res->end(file_reader_from_fd(fd));
-       });
-  } catch (std::exception& e) {
+      struct stat stbuf;
+      if (stat(path.c_str(), &stbuf) == 0) {
+        headers.push_back(
+            header{"content-length", std::to_string(stbuf.st_size)});
+        headers.push_back(
+            header{"last-modified", http_date(stbuf.st_mtim.tv_sec)});
+      }
+      res->write_head(200, std::move(headers));
+      res->end(file_reader_from_fd(fd));
+    });
+  } catch (std::exception &e) {
     std::cerr << "exception: " << e.what() << "\n";
   }
 

examples/asio-sv3.cc

@@ -43,8 +43,7 @@
 using namespace nghttp2::asio_http2;
 using namespace nghttp2::asio_http2::server;
 
-int main(int argc, char* argv[])
-{
+int main(int argc, char *argv[]) {
   try {
     // Check command line arguments.
     if (argc < 4) {
@@ -61,89 +60,81 @@ int main(int argc, char* argv[])
 
     server.num_threads(num_threads);
 
-    if(argc >= 5) {
+    if (argc >= 5) {
       server.tls(argv[4], argv[5]);
     }
 
     server.num_concurrent_tasks(num_concurrent_tasks);
 
-    server.listen
-      ("*", port,
-       [](const std::shared_ptr<request>& req,
-          const std::shared_ptr<response>& res)
-       {
-         res->write_head(200);
-
-         auto msgq = std::make_shared<std::deque<std::string>>();
-
-         res->end
-           ([msgq](uint8_t *buf, std::size_t len) -> std::pair<ssize_t, bool>
-            {
-              if(msgq->empty()) {
-                // if msgq is empty, tells the library that don't call
-                // this callback until we call res->resume().  This is
-                // done by returing std::make_pair(0, false).
-                return std::make_pair(0, false);
-              }
-              auto msg = std::move(msgq->front());
-              msgq->pop_front();
-
-              if(msg.empty()) {
-                // The empty message signals the end of response in
-                // this simple protocol.
-                return std::make_pair(0, true);
-              }
-
-              auto nwrite = std::min(len, msg.size());
-              std::copy(std::begin(msg), std::begin(msg) + nwrite, buf);
-              if(msg.size() > nwrite) {
-                msgq->push_front(msg.substr(nwrite));
-              }
-              return std::make_pair(nwrite, false);
-            });
-
-         req->run_task
-           ([res, msgq](channel& channel)
-            {
-              // executed in different thread from request callback
-              // was called.
-
-              // Using res and msgq is not safe inside this callback.
-              // But using them in callback passed to channel::post is
-              // safe.
-
-              // We just emit simple message "message N\n" in every 1
-              // second and 3 times in total.
-              for(std::size_t i = 0; i < 3; ++i) {
-                msgq->push_back("message " + std::to_string(i + 1) + "\n");
-
-                channel.post([res]()
-                             {
-                               // executed in same thread where
-                               // request callback was called.
-
-                               // Tells library we have new message.
-                               res->resume();
-                             });
-
-                sleep(1);
-              }
-
-              // Send empty message to signal the end of response
-              // body.
-              msgq->push_back("");
-
-              channel.post([res]()
-                           {
-                             // executed in same thread where request
-                             // callback was called.
-                             res->resume();
-                           });
-
-            });
-
-       });
-  } catch (std::exception& e) {
+    server.listen("*", port, [](const std::shared_ptr<request> &req,
+                                const std::shared_ptr<response> &res) {
+      res->write_head(200);
+
+      auto msgq = std::make_shared<std::deque<std::string>>();
+
+      res->end([msgq](uint8_t * buf, std::size_t len)
+                   -> std::pair<ssize_t, bool> {
+        if (msgq->empty()) {
+          // if msgq is empty, tells the library that don't call
+          // this callback until we call res->resume().  This is
+          // done by returing std::make_pair(0, false).
+          return std::make_pair(0, false);
+        }
+        auto msg = std::move(msgq->front());
+        msgq->pop_front();
+
+        if (msg.empty()) {
+          // The empty message signals the end of response in
+          // this simple protocol.
+          return std::make_pair(0, true);
+        }
+
+        auto nwrite = std::min(len, msg.size());
+        std::copy(std::begin(msg), std::begin(msg) + nwrite, buf);
+        if (msg.size() > nwrite) {
+          msgq->push_front(msg.substr(nwrite));
+        }
+        return std::make_pair(nwrite, false);
+      });
+
+      req->run_task([res, msgq](channel &channel) {
+        // executed in different thread from request callback
+        // was called.
+
+        // Using res and msgq is not safe inside this callback.
+        // But using them in callback passed to channel::post is
+        // safe.
+
+        // We just emit simple message "message N\n" in every 1
+        // second and 3 times in total.
+        for (std::size_t i = 0; i < 3; ++i) {
+          msgq->push_back("message " + std::to_string(i + 1) + "\n");
+
+          channel.post([res]() {
+            // executed in same thread where
+            // request callback was called.
+
+            // Tells library we have new message.
+            res->resume();
+          });
+
+          sleep(1);
+        }
+
+        // Send empty message to signal the end of response
+        // body.
+        msgq->push_back("");
+
+        channel.post([res]() {
+          // executed in same thread where request
+          // callback was called.
+          res->resume();
+        });
+
+      });
+
+    });
+  } catch (std::exception &e) {
     std::cerr << "exception: " << e.what() << "\n";
   }
 

examples/deflate.c

@@ -31,43 +31,39 @@
 
 #include <nghttp2/nghttp2.h>
 
-#define MAKE_NV(K, V)                                           \
-  { (uint8_t*)K, (uint8_t*)V, sizeof(K) - 1, sizeof(V) - 1,     \
-      NGHTTP2_NV_FLAG_NONE }
+#define MAKE_NV(K, V)                                                          \
+  {                                                                            \
+    (uint8_t *) K, (uint8_t *)V, sizeof(K) - 1, sizeof(V) - 1,                 \
+        NGHTTP2_NV_FLAG_NONE                                                   \
+  }
 
 static void deflate(nghttp2_hd_deflater *deflater,
-                    nghttp2_hd_inflater *inflater,
-                    const nghttp2_nv * const nva, size_t nvlen);
+                    nghttp2_hd_inflater *inflater, const nghttp2_nv *const nva,
+                    size_t nvlen);
 
-static int inflate_header_block(nghttp2_hd_inflater *inflater,
-                                uint8_t *in, size_t inlen, int final);
+static int inflate_header_block(nghttp2_hd_inflater *inflater, uint8_t *in,
+                                size_t inlen, int final);
 
-int main(int argc _U_, char **argv _U_)
-{
+int main(int argc _U_, char **argv _U_) {
   int rv;
   nghttp2_hd_deflater *deflater;
   nghttp2_hd_inflater *inflater;
   /* Define 1st header set.  This is looks like a HTTP request. */
   nghttp2_nv nva1[] = {
-    MAKE_NV(":scheme", "https"),
-    MAKE_NV(":authority", "example.org"),
-    MAKE_NV(":path", "/"),
-    MAKE_NV("user-agent", "libnghttp2"),
-    MAKE_NV("accept-encoding", "gzip, deflate")
-  };
+      MAKE_NV(":scheme", "https"), MAKE_NV(":authority", "example.org"),
+      MAKE_NV(":path", "/"), MAKE_NV("user-agent", "libnghttp2"),
+      MAKE_NV("accept-encoding", "gzip, deflate")};
   /* Define 2nd header set */
-  nghttp2_nv nva2[] = {
-    MAKE_NV(":scheme", "https"),
-    MAKE_NV(":authority", "example.org"),
-    MAKE_NV(":path", "/stylesheet/style.css"),
-    MAKE_NV("user-agent", "libnghttp2"),
-    MAKE_NV("accept-encoding", "gzip, deflate"),
-    MAKE_NV("referer", "https://example.org")
-  };
+  nghttp2_nv nva2[] = {MAKE_NV(":scheme", "https"),
+                       MAKE_NV(":authority", "example.org"),
+                       MAKE_NV(":path", "/stylesheet/style.css"),
+                       MAKE_NV("user-agent", "libnghttp2"),
+                       MAKE_NV("accept-encoding", "gzip, deflate"),
+                       MAKE_NV("referer", "https://example.org")};
 
   rv = nghttp2_hd_deflate_new(&deflater, 4096);
 
-  if(rv != 0) {
+  if (rv != 0) {
     fprintf(stderr, "nghttp2_hd_deflate_init failed with error: %s\n",
             nghttp2_strerror(rv));
     exit(EXIT_FAILURE);
@@ -75,7 +71,7 @@ int main(int argc _U_, char **argv _U_)
 
   rv = nghttp2_hd_inflate_new(&inflater);
 
-  if(rv != 0) {
+  if (rv != 0) {
     fprintf(stderr, "nghttp2_hd_inflate_init failed with error: %s\n",
             nghttp2_strerror(rv));
     exit(EXIT_FAILURE);
@@ -95,9 +91,8 @@ int main(int argc _U_, char **argv _U_)
 }
 
 static void deflate(nghttp2_hd_deflater *deflater,
-                    nghttp2_hd_inflater *inflater,
-                    const nghttp2_nv * const nva, size_t nvlen)
-{
+                    nghttp2_hd_inflater *inflater, const nghttp2_nv *const nva,
+                    size_t nvlen) {
   ssize_t rv;
   uint8_t *buf;
   size_t buflen;
@@ -107,13 +102,13 @@ static void deflate(nghttp2_hd_deflater *deflater,
 
   sum = 0;
 
-  for(i = 0; i < nvlen; ++i) {
+  for (i = 0; i < nvlen; ++i) {
     sum += nva[i].namelen + nva[i].valuelen;
   }
 
   printf("Input (%zu byte(s)):\n\n", sum);
 
-  for(i = 0; i < nvlen; ++i) {
+  for (i = 0; i < nvlen; ++i) {
     fwrite(nva[i].name, nva[i].namelen, 1, stdout);
     printf(": ");
     fwrite(nva[i].value, nva[i].valuelen, 1, stdout);
@@ -125,7 +120,7 @@ static void deflate(nghttp2_hd_deflater *deflater,
 
   rv = nghttp2_hd_deflate_hd(deflater, buf, buflen, nva, nvlen);
 
-  if(rv < 0) {
+  if (rv < 0) {
     fprintf(stderr, "nghttp2_hd_deflate_hd() failed with error: %s\n",
             nghttp2_strerror((int)rv));
 
@@ -136,17 +131,17 @@ static void deflate(nghttp2_hd_deflater *deflater,
 
   outlen = rv;
 
-  printf("\nDeflate (%zu byte(s), ratio %.02f):\n\n",
-         outlen, sum == 0 ? 0 : (double)outlen / sum);
+  printf("\nDeflate (%zu byte(s), ratio %.02f):\n\n", outlen,
+         sum == 0 ? 0 : (double)outlen / sum);
 
-  for(i = 0; i < outlen; ++i) {
-    if((i & 0x0fu) == 0) {
+  for (i = 0; i < outlen; ++i) {
+    if ((i & 0x0fu) == 0) {
       printf("%08zX: ", i);
     }
 
     printf("%02X ", buf[i]);
 
-    if(((i + 1) & 0x0fu) == 0) {
+    if (((i + 1) & 0x0fu) == 0) {
       printf("\n");
     }
   }
@@ -157,7 +152,7 @@ static void deflate(nghttp2_hd_deflater *deflater,
      header data. */
   rv = inflate_header_block(inflater, buf, outlen, 1);
 
-  if(rv != 0) {
+  if (rv != 0) {
     free(buf);
 
     exit(EXIT_FAILURE);
@@ -169,20 +164,18 @@ static void deflate(nghttp2_hd_deflater *deflater,
   free(buf);
 }
 
-int inflate_header_block(nghttp2_hd_inflater *inflater,
-                         uint8_t *in, size_t inlen, int final)
-{
+int inflate_header_block(nghttp2_hd_inflater *inflater, uint8_t *in,
+                         size_t inlen, int final) {
   ssize_t rv;
 
-  for(;;) {
+  for (;;) {
     nghttp2_nv nv;
     int inflate_flags = 0;
     size_t proclen;
 
-    rv = nghttp2_hd_inflate_hd(inflater, &nv, &inflate_flags,
-                               in, inlen, final);
+    rv = nghttp2_hd_inflate_hd(inflater, &nv, &inflate_flags, in, inlen, final);
 
-    if(rv < 0) {
+    if (rv < 0) {
       fprintf(stderr, "inflate failed with error code %zd", rv);
       return -1;
     }
@@ -192,20 +185,19 @@ int inflate_header_block(nghttp2_hd_inflater *inflater,
     in += proclen;
     inlen -= proclen;
 
-    if(inflate_flags & NGHTTP2_HD_INFLATE_EMIT) {
+    if (inflate_flags & NGHTTP2_HD_INFLATE_EMIT) {
       fwrite(nv.name, nv.namelen, 1, stderr);
       fprintf(stderr, ": ");
       fwrite(nv.value, nv.valuelen, 1, stderr);
       fprintf(stderr, "\n");
     }
 
-    if(inflate_flags & NGHTTP2_HD_INFLATE_FINAL) {
+    if (inflate_flags & NGHTTP2_HD_INFLATE_FINAL) {
       nghttp2_hd_inflate_end_headers(inflater);
       break;
     }
 
-    if((inflate_flags & NGHTTP2_HD_INFLATE_EMIT) == 0 &&
-       inlen == 0) {
+    if ((inflate_flags & NGHTTP2_HD_INFLATE_EMIT) == 0 && inlen == 0) {
       break;
     }
   }

lib/nghttp2_buf.h

@@ -26,7 +26,7 @@
 #define NGHTTP2_BUF_H
 
 #ifdef HAVE_CONFIG_H
-#  include <config.h>
+#include <config.h>
 #endif /* HAVE_CONFIG_H */
 
 #include <nghttp2/nghttp2.h>
@@ -58,17 +58,17 @@ typedef struct {
 #define nghttp2_buf_pos_offset(BUF) ((ssize_t)((BUF)->pos - (BUF)->begin))
 #define nghttp2_buf_last_offset(BUF) ((ssize_t)((BUF)->last - (BUF)->begin))
 
-#define nghttp2_buf_shift_right(BUF, AMT) \
-  do {                                    \
-    (BUF)->pos += AMT;                    \
-    (BUF)->last += AMT;                   \
-  } while(0)
+#define nghttp2_buf_shift_right(BUF, AMT)                                      \
+  do {                                                                         \
+    (BUF)->pos += AMT;                                                         \
+    (BUF)->last += AMT;                                                        \
+  } while (0)
 
-#define nghttp2_buf_shift_left(BUF, AMT)            \
-  do {                                              \
-    (BUF)->pos -= AMT;                              \
-    (BUF)->last -= AMT;                             \
-  } while(0)
+#define nghttp2_buf_shift_left(BUF, AMT)                                       \
+  do {                                                                         \
+    (BUF)->pos -= AMT;                                                         \
+    (BUF)->last -= AMT;                                                        \
+  } while (0)
 
 /*
  * Initializes the |buf|. No memory is allocated in this function. Use
@@ -76,7 +76,6 @@ typedef struct {
  */
 void nghttp2_buf_init(nghttp2_buf *buf);
 
-
 /*
  * Initializes the |buf| and allocates at least |initial| bytes of
  * memory.
@@ -264,15 +263,15 @@ int nghttp2_bufs_addb(nghttp2_bufs *bufs, uint8_t b);
  */
 int nghttp2_bufs_addb_hold(nghttp2_bufs *bufs, uint8_t b);
 
-#define nghttp2_bufs_fast_addb(BUFS, B)          \
-  do {                                           \
-    *(BUFS)->cur->buf.last++ = B;                \
-  } while(0)
+#define nghttp2_bufs_fast_addb(BUFS, B)                                        \
+  do {                                                                         \
+    *(BUFS)->cur->buf.last++ = B;                                              \
+  } while (0)
 
-#define nghttp2_bufs_fast_addb_hold(BUFS, B)     \
-  do {                                           \
-    *(BUFS)->cur->buf.last = B;                  \
-  } while(0)
+#define nghttp2_bufs_fast_addb_hold(BUFS, B)                                   \
+  do {                                                                         \
+    *(BUFS)->cur->buf.last = B;                                                \
+  } while (0)
 
 /*
  * Performs bitwise-OR of |b| at bufs->cur->buf.last. A new buffers
@@ -294,15 +293,15 @@ int nghttp2_bufs_orb(nghttp2_bufs *bufs, uint8_t b);
  */
 int nghttp2_bufs_orb_hold(nghttp2_bufs *bufs, uint8_t b);
 
-#define nghttp2_bufs_fast_orb(BUFS, B)          \
-  do {                                          \
-    *(BUFS)->cur->buf.last++ |= B;              \
-  } while(0)
+#define nghttp2_bufs_fast_orb(BUFS, B)                                         \
+  do {                                                                         \
+    *(BUFS)->cur->buf.last++ |= B;                                             \
+  } while (0)
 
-#define nghttp2_bufs_fast_orb_hold(BUFS, B)     \
-  do {                                          \
-    *(BUFS)->cur->buf.last |= B;                \
-  } while(0)
+#define nghttp2_bufs_fast_orb_hold(BUFS, B)                                    \
+  do {                                                                         \
+    *(BUFS)->cur->buf.last |= B;                                               \
+  } while (0)
 
 /*
  * Copies all data stored in |bufs| to the contagious buffer.  This
@@ -342,10 +341,10 @@ void nghttp2_bufs_reset(nghttp2_bufs *bufs);
 int nghttp2_bufs_advance(nghttp2_bufs *bufs);
 
 /* Sets bufs->cur to bufs->head */
-#define nghttp2_bufs_rewind(BUFS)               \
-  do {                                          \
-    (BUFS)->cur = (BUFS)->head;                 \
-  } while(0)
+#define nghttp2_bufs_rewind(BUFS)                                              \
+  do {                                                                         \
+    (BUFS)->cur = (BUFS)->head;                                                \
+  } while (0)
 
 /*
  * Move bufs->cur, from the current position, using next member, to

lib/nghttp2_callbacks.h

@@ -26,7 +26,7 @@
 #define NGHTTP2_CALLBACKS_H
 
 #ifdef HAVE_CONFIG_H
-#  include <config.h>
+#include <config.h>
 #endif /* HAVE_CONFIG_H */
 
 #include <nghttp2/nghttp2.h>

lib/nghttp2_hd.h

@@ -26,7 +26,7 @@
 #define NGHTTP2_HD_H
 
 #ifdef HAVE_CONFIG_H
-#  include <config.h>
+#include <config.h>
 #endif /* HAVE_CONFIG_H */
 
 #include <nghttp2/nghttp2.h>
@@ -183,9 +183,8 @@ struct nghttp2_hd_inflater {
  * NGHTTP2_ERR_NOMEM
  *     Out of memory.
  */
-int nghttp2_hd_entry_init(nghttp2_hd_entry *ent, uint8_t flags,
-                          uint8_t *name, size_t namelen,
-                          uint8_t *value, size_t valuelen,
+int nghttp2_hd_entry_init(nghttp2_hd_entry *ent, uint8_t flags, uint8_t *name,
+                          size_t namelen, uint8_t *value, size_t valuelen,
                           uint32_t name_hash, uint32_t value_hash);
 
 void nghttp2_hd_entry_free(nghttp2_hd_entry *ent);
@@ -248,8 +247,8 @@ void nghttp2_hd_deflate_free(nghttp2_hd_deflater *deflater);
  *     Out of buffer space.
  */
 int nghttp2_hd_deflate_hd_bufs(nghttp2_hd_deflater *deflater,
-                               nghttp2_bufs *bufs,
-                               const nghttp2_nv *nva, size_t nvlen);
+                               nghttp2_bufs *bufs, const nghttp2_nv *nva,
+                               size_t nvlen);
 
 /*
  * Initializes |inflater| for inflating name/values pairs.
@@ -279,13 +278,13 @@ int nghttp2_hd_emit_newname_block(nghttp2_bufs *bufs, nghttp2_nv *nv,
 int nghttp2_hd_emit_table_size(nghttp2_bufs *bufs, size_t table_size);
 
 /* For unittesting purpose */
-nghttp2_hd_entry* nghttp2_hd_table_get(nghttp2_hd_context *context,
+nghttp2_hd_entry *nghttp2_hd_table_get(nghttp2_hd_context *context,
                                        size_t index);
 
 /* For unittesting purpose */
 ssize_t nghttp2_hd_decode_length(uint32_t *res, size_t *shift_ptr, int *final,
-                                 uint32_t initial, size_t shift,
-                                 uint8_t *in, uint8_t *last, size_t prefix);
+                                 uint32_t initial, size_t shift, uint8_t *in,
+                                 uint8_t *last, size_t prefix);
 
 /* Huffman encoding/decoding functions */
 
@@ -310,8 +309,8 @@ size_t nghttp2_hd_huff_encode_count(const uint8_t *src, size_t len);
  * NGHTTP2_ERR_BUFFER_ERROR
  *     Out of buffer space.
  */
-int nghttp2_hd_huff_encode(nghttp2_bufs *bufs,
-                           const uint8_t *src, size_t srclen);
+int nghttp2_hd_huff_encode(nghttp2_bufs *bufs, const uint8_t *src,
+                           size_t srclen);
 
 void nghttp2_hd_huff_decode_context_init(nghttp2_hd_huff_decode_context *ctx);
 
@@ -339,7 +338,7 @@ void nghttp2_hd_huff_decode_context_init(nghttp2_hd_huff_decode_context *ctx);
  *     Decoding process has failed.
  */
 ssize_t nghttp2_hd_huff_decode(nghttp2_hd_huff_decode_context *ctx,
-                               nghttp2_bufs *bufs,
-                               const uint8_t *src, size_t srclen, int final);
+                               nghttp2_bufs *bufs, const uint8_t *src,
+                               size_t srclen, int final);
 
 #endif /* NGHTTP2_HD_H */

lib/nghttp2_hd_huffman.h

@@ -26,7 +26,7 @@
 #define NGHTTP2_HD_HUFFMAN_H
 
 #ifdef HAVE_CONFIG_H
-#  include <config.h>
+#include <config.h>
 #endif /* HAVE_CONFIG_H */
 
 #include <nghttp2/nghttp2.h>

src/h2load_http2_session.h

@@ -42,6 +42,7 @@ public:
   virtual ssize_t on_read();
   virtual int on_write();
   virtual void terminate();
+
 private:
   Client *client_;
   nghttp2_session *session_;