Skip to content

Commit 3638694

Browse files
apapirovskigibfahn
apapirovski
authored and
gibfahn
committed
http2: fix errors in debug statements
When compiling with --debug-http2 flag, compiler complains about passing wrong type of argument to DEBUG_HTTP2. Fix by using static_cast to uint32_t. PR-URL: #16373 Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 3a230b4 commit 3638694

File tree

1 file changed

+18
-12
lines changed

1 file changed

+18
-12
lines changed

‎src/node_http2.cc

+18-12
Original file line numberDiff line numberDiff line change
@@ -141,42 +141,45 @@ void PackSettings(const FunctionCallbackInfo<Value>& args) {
141141

142142
if (flags & (1 << IDX_SETTINGS_HEADER_TABLE_SIZE)) {
143143
DEBUG_HTTP2("Setting header table size: %d\n",
144-
buffer[IDX_SETTINGS_HEADER_TABLE_SIZE]);
144+
static_cast<uint32_t>(buffer[IDX_SETTINGS_HEADER_TABLE_SIZE]));
145145
entries.push_back({NGHTTP2_SETTINGS_HEADER_TABLE_SIZE,
146146
buffer[IDX_SETTINGS_HEADER_TABLE_SIZE]});
147147
}
148148

149149
if (flags & (1 << IDX_SETTINGS_MAX_CONCURRENT_STREAMS)) {
150150
DEBUG_HTTP2("Setting max concurrent streams: %d\n",
151-
buffer[IDX_SETTINGS_MAX_CONCURRENT_STREAMS]);
151+
static_cast<uint32_t>(
152+
buffer[IDX_SETTINGS_MAX_CONCURRENT_STREAMS]));
152153
entries.push_back({NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS,
153154
buffer[IDX_SETTINGS_MAX_CONCURRENT_STREAMS]});
154155
}
155156

156157
if (flags & (1 << IDX_SETTINGS_MAX_FRAME_SIZE)) {
157158
DEBUG_HTTP2("Setting max frame size: %d\n",
158-
buffer[IDX_SETTINGS_MAX_FRAME_SIZE]);
159+
static_cast<uint32_t>(buffer[IDX_SETTINGS_MAX_FRAME_SIZE]));
159160
entries.push_back({NGHTTP2_SETTINGS_MAX_FRAME_SIZE,
160161
buffer[IDX_SETTINGS_MAX_FRAME_SIZE]});
161162
}
162163

163164
if (flags & (1 << IDX_SETTINGS_INITIAL_WINDOW_SIZE)) {
164165
DEBUG_HTTP2("Setting initial window size: %d\n",
165-
buffer[IDX_SETTINGS_INITIAL_WINDOW_SIZE]);
166+
static_cast<uint32_t>(
167+
buffer[IDX_SETTINGS_INITIAL_WINDOW_SIZE]));
166168
entries.push_back({NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE,
167169
buffer[IDX_SETTINGS_INITIAL_WINDOW_SIZE]});
168170
}
169171

170172
if (flags & (1 << IDX_SETTINGS_MAX_HEADER_LIST_SIZE)) {
171173
DEBUG_HTTP2("Setting max header list size: %d\n",
172-
buffer[IDX_SETTINGS_MAX_HEADER_LIST_SIZE]);
174+
static_cast<uint32_t>(
175+
buffer[IDX_SETTINGS_MAX_HEADER_LIST_SIZE]));
173176
entries.push_back({NGHTTP2_SETTINGS_MAX_HEADER_LIST_SIZE,
174177
buffer[IDX_SETTINGS_MAX_HEADER_LIST_SIZE]});
175178
}
176179

177180
if (flags & (1 << IDX_SETTINGS_ENABLE_PUSH)) {
178181
DEBUG_HTTP2("Setting enable push: %d\n",
179-
buffer[IDX_SETTINGS_ENABLE_PUSH]);
182+
static_cast<uint32_t>(buffer[IDX_SETTINGS_ENABLE_PUSH]));
180183
entries.push_back({NGHTTP2_SETTINGS_ENABLE_PUSH,
181184
buffer[IDX_SETTINGS_ENABLE_PUSH]});
182185
}
@@ -418,42 +421,45 @@ void Http2Session::SubmitSettings(const FunctionCallbackInfo<Value>& args) {
418421

419422
if (flags & (1 << IDX_SETTINGS_HEADER_TABLE_SIZE)) {
420423
DEBUG_HTTP2("Setting header table size: %d\n",
421-
buffer[IDX_SETTINGS_HEADER_TABLE_SIZE]);
424+
static_cast<uint32_t>(buffer[IDX_SETTINGS_HEADER_TABLE_SIZE]));
422425
entries.push_back({NGHTTP2_SETTINGS_HEADER_TABLE_SIZE,
423426
buffer[IDX_SETTINGS_HEADER_TABLE_SIZE]});
424427
}
425428

426429
if (flags & (1 << IDX_SETTINGS_MAX_CONCURRENT_STREAMS)) {
427430
DEBUG_HTTP2("Setting max concurrent streams: %d\n",
428-
buffer[IDX_SETTINGS_MAX_CONCURRENT_STREAMS]);
431+
static_cast<uint32_t>(
432+
buffer[IDX_SETTINGS_MAX_CONCURRENT_STREAMS]));
429433
entries.push_back({NGHTTP2_SETTINGS_MAX_CONCURRENT_STREAMS,
430434
buffer[IDX_SETTINGS_MAX_CONCURRENT_STREAMS]});
431435
}
432436

433437
if (flags & (1 << IDX_SETTINGS_MAX_FRAME_SIZE)) {
434438
DEBUG_HTTP2("Setting max frame size: %d\n",
435-
buffer[IDX_SETTINGS_MAX_FRAME_SIZE]);
439+
static_cast<uint32_t>(buffer[IDX_SETTINGS_MAX_FRAME_SIZE]));
436440
entries.push_back({NGHTTP2_SETTINGS_MAX_FRAME_SIZE,
437441
buffer[IDX_SETTINGS_MAX_FRAME_SIZE]});
438442
}
439443

440444
if (flags & (1 << IDX_SETTINGS_INITIAL_WINDOW_SIZE)) {
441445
DEBUG_HTTP2("Setting initial window size: %d\n",
442-
buffer[IDX_SETTINGS_INITIAL_WINDOW_SIZE]);
446+
static_cast<uint32_t>(
447+
buffer[IDX_SETTINGS_INITIAL_WINDOW_SIZE]));
443448
entries.push_back({NGHTTP2_SETTINGS_INITIAL_WINDOW_SIZE,
444449
buffer[IDX_SETTINGS_INITIAL_WINDOW_SIZE]});
445450
}
446451

447452
if (flags & (1 << IDX_SETTINGS_MAX_HEADER_LIST_SIZE)) {
448453
DEBUG_HTTP2("Setting max header list size: %d\n",
449-
buffer[IDX_SETTINGS_MAX_HEADER_LIST_SIZE]);
454+
static_cast<uint32_t>(
455+
buffer[IDX_SETTINGS_MAX_HEADER_LIST_SIZE]));
450456
entries.push_back({NGHTTP2_SETTINGS_MAX_HEADER_LIST_SIZE,
451457
buffer[IDX_SETTINGS_MAX_HEADER_LIST_SIZE]});
452458
}
453459

454460
if (flags & (1 << IDX_SETTINGS_ENABLE_PUSH)) {
455461
DEBUG_HTTP2("Setting enable push: %d\n",
456-
buffer[IDX_SETTINGS_ENABLE_PUSH]);
462+
static_cast<uint32_t>(buffer[IDX_SETTINGS_ENABLE_PUSH]));
457463
entries.push_back({NGHTTP2_SETTINGS_ENABLE_PUSH,
458464
buffer[IDX_SETTINGS_ENABLE_PUSH]});
459465
}

0 commit comments

Comments
 (0)