walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Make static_table const qualified

This commit is contained in:
Tatsuhiro Tsujikawa 2018-09-13 23:48:53 +09:00
parent ed7c9db2a6
commit dfc0f248c6
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/nghttp2_hd.c
View File

@ -45,7 +45,7 @@
/* 3rd parameter is nghttp2_token value for header field name. We use /* 3rd parameter is nghttp2_token value for header field name. We use
first enum value if same header names are repeated (e.g., first enum value if same header names are repeated (e.g.,
:status). */ :status). */
static nghttp2_hd_static_entry static_table[] = { static const nghttp2_hd_static_entry static_table[] = {
MAKE_STATIC_ENT(":authority", "", 0, 3153725150u), MAKE_STATIC_ENT(":authority", "", 0, 3153725150u),
MAKE_STATIC_ENT(":method", "GET", 1, 695666056u), MAKE_STATIC_ENT(":method", "GET", 1, 695666056u),
MAKE_STATIC_ENT(":method", "POST", 1, 695666056u), MAKE_STATIC_ENT(":method", "POST", 1, 695666056u),
@ -1159,7 +1159,7 @@ static search_result search_static_table(const nghttp2_nv *nv, int32_t token,
int name_only) { int name_only) {
search_result res = {token, 0}; search_result res = {token, 0};
int i; int i;
nghttp2_hd_static_entry *ent; const nghttp2_hd_static_entry *ent;
if (name_only) { if (name_only) {
return res; return res;
@ -1184,7 +1184,7 @@ static search_result search_hd_table(nghttp2_hd_context *context,
int indexing_mode, nghttp2_hd_map *map, int indexing_mode, nghttp2_hd_map *map,
uint32_t hash) { uint32_t hash) {
search_result res = {-1, 0}; search_result res = {-1, 0};
nghttp2_hd_entry *ent; const nghttp2_hd_entry *ent;
int exact_match; int exact_match;
int name_only = indexing_mode == NGHTTP2_HD_NEVER_INDEXING; int name_only = indexing_mode == NGHTTP2_HD_NEVER_INDEXING;
@ -1289,8 +1289,9 @@ nghttp2_hd_nv nghttp2_hd_table_get(nghttp2_hd_context *context, size_t idx) {
return hd_ringbuf_get(&context->hd_table, idx - NGHTTP2_STATIC_TABLE_LENGTH) return hd_ringbuf_get(&context->hd_table, idx - NGHTTP2_STATIC_TABLE_LENGTH)
->nv; ->nv;
} else { } else {
nghttp2_hd_static_entry *ent = &static_table[idx]; const nghttp2_hd_static_entry *ent = &static_table[idx];
nghttp2_hd_nv nv = {&ent->name, &ent->value, ent->token, nghttp2_hd_nv nv = {(nghttp2_rcbuf *)&ent->name,
(nghttp2_rcbuf *)&ent->value, ent->token,
NGHTTP2_NV_FLAG_NONE}; NGHTTP2_NV_FLAG_NONE};
return nv; return nv;
} }