Merge branch 'oops-i-split-it-again' into tis-but-thy-name

2 files changed, 18 insertions, 21 deletions

diff --git a/tools/codegen/core/gen_hpack_tables.c b/tools/codegen/core/gen_hpack_tables.c
index bdaa3cf094..555f1e71c5 100644
--- a/tools/codegen/core/gen_hpack_tables.c
+++ b/tools/codegen/core/gen_hpack_tables.c
@@ -55,19 +55,15 @@ typedef struct {
   unsigned char index;
 } spec;
 
-static const spec fields[] = {{"INDEXED_FIELD", 0X80, 1, 1},
-                              {"INDEXED_FIELD_X", 0X80, 1, 2},
-                              {"LITHDR_INCIDX", 0X40, 2, 1},
-                              {"LITHDR_INCIDX_X", 0X40, 2, 2},
-                              {"LITHDR_INCIDX_V", 0X40, 2, 0},
-                              {"LITHDR_NOTIDX", 0X00, 4, 1},
-                              {"LITHDR_NOTIDX_X", 0X00, 4, 2},
-                              {"LITHDR_NOTIDX_V", 0X00, 4, 0},
-                              {"LITHDR_NVRIDX", 0X10, 4, 1},
-                              {"LITHDR_NVRIDX_X", 0X10, 4, 2},
-                              {"LITHDR_NVRIDX_V", 0X10, 4, 0},
-                              {"MAX_TBL_SIZE", 0X20, 3, 1},
-                              {"MAX_TBL_SIZE_X", 0X20, 3, 2}, };
+static const spec fields[] = {
+    {"INDEXED_FIELD", 0X80, 1, 1},   {"INDEXED_FIELD_X", 0X80, 1, 2},
+    {"LITHDR_INCIDX", 0X40, 2, 1},   {"LITHDR_INCIDX_X", 0X40, 2, 2},
+    {"LITHDR_INCIDX_V", 0X40, 2, 0}, {"LITHDR_NOTIDX", 0X00, 4, 1},
+    {"LITHDR_NOTIDX_X", 0X00, 4, 2}, {"LITHDR_NOTIDX_V", 0X00, 4, 0},
+    {"LITHDR_NVRIDX", 0X10, 4, 1},   {"LITHDR_NVRIDX_X", 0X10, 4, 2},
+    {"LITHDR_NVRIDX_V", 0X10, 4, 0}, {"MAX_TBL_SIZE", 0X20, 3, 1},
+    {"MAX_TBL_SIZE_X", 0X20, 3, 2},
+};
 
 static const int num_fields = sizeof(fields) / sizeof(*fields);
 
@@ -129,13 +125,9 @@ static void generate_first_byte_lut(void) {
 #define MAXHUFFSTATES 1024
 
 /* represents a set of symbols as an array of booleans indicating inclusion */
-typedef struct {
-  char included[GRPC_CHTTP2_NUM_HUFFSYMS];
-} symset;
+typedef struct { char included[GRPC_CHTTP2_NUM_HUFFSYMS]; } symset;
 /* represents a lookup table indexed by a nibble */
-typedef struct {
-  int values[16];
-} nibblelut;
+typedef struct { int values[16]; } nibblelut;
 
 /* returns a symset that includes all possible symbols */
 static symset symset_all(void) {
@@ -268,8 +260,7 @@ static void build_dec_tbl(int state, int nibble, int nibbits, unsigned bitofs,
     /* recurse down for this bit */
     build_dec_tbl(state, (nibble << 1) | bit, nibbits + 1, bitofs + 1, emit,
                   nextsyms);
-  next:
-    ;
+  next:;
   }
 }
 
diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal
index a71ebdbf1e..4f00104c02 100644
--- a/tools/doxygen/Doxyfile.core.internal
+++ b/tools/doxygen/Doxyfile.core.internal
@@ -864,6 +864,8 @@ src/core/transport/chttp2/hpack_parser.h \
 src/core/transport/chttp2/hpack_table.h \
 src/core/transport/chttp2/http2_errors.h \
 src/core/transport/chttp2/huffsyms.h \
+src/core/transport/chttp2/incoming_metadata.h \
+src/core/transport/chttp2/internal.h \
 src/core/transport/chttp2/status_conversion.h \
 src/core/transport/chttp2/stream_encoder.h \
 src/core/transport/chttp2/stream_map.h \
@@ -989,11 +991,15 @@ src/core/transport/chttp2/frame_window_update.c \
 src/core/transport/chttp2/hpack_parser.c \
 src/core/transport/chttp2/hpack_table.c \
 src/core/transport/chttp2/huffsyms.c \
+src/core/transport/chttp2/incoming_metadata.c \
+src/core/transport/chttp2/parsing.c \
 src/core/transport/chttp2/status_conversion.c \
 src/core/transport/chttp2/stream_encoder.c \
+src/core/transport/chttp2/stream_lists.c \
 src/core/transport/chttp2/stream_map.c \
 src/core/transport/chttp2/timeout_encoding.c \
 src/core/transport/chttp2/varint.c \
+src/core/transport/chttp2/writing.c \
 src/core/transport/chttp2_transport.c \
 src/core/transport/metadata.c \
 src/core/transport/stream_op.c \