diff options
| author | Roman Arutyunyan <arut@nginx.com> | 2020-07-03 12:07:43 +0300 |
|---|---|---|
| committer | Roman Arutyunyan <arut@nginx.com> | 2020-07-03 12:07:43 +0300 |
| commit | ac9c1dcad8becffd188321600ff4edd2d49dcca6 (patch) | |
| tree | f89d9f555d819579f9f86b33471229355fc4600d /src | |
| parent | 8d1875d39ab60a6494a1d3b4be34fc35213d74df (diff) | |
| download | nginx-ac9c1dcad8becffd188321600ff4edd2d49dcca6.tar.gz nginx-ac9c1dcad8becffd188321600ff4edd2d49dcca6.zip | |
HTTP/3: put ngx_http_v3_parse_varlen_int() return code in variable.
This makes calling this function similar to other parse functions.
Diffstat (limited to 'src')
| -rw-r--r-- | src/http/v3/ngx_http_v3_parse.c | 42 |
1 files changed, 26 insertions, 16 deletions
diff --git a/src/http/v3/ngx_http_v3_parse.c b/src/http/v3/ngx_http_v3_parse.c index 4e0532781..e1e9444e1 100644 --- a/src/http/v3/ngx_http_v3_parse.c +++ b/src/http/v3/ngx_http_v3_parse.c @@ -177,8 +177,9 @@ ngx_http_v3_parse_headers(ngx_connection_t *c, ngx_http_v3_parse_headers_t *st, case sw_length: - if (ngx_http_v3_parse_varlen_int(c, &st->vlint, ch) != NGX_DONE) { - break; + rc = ngx_http_v3_parse_varlen_int(c, &st->vlint, ch); + if (rc != NGX_DONE) { + return rc; } st->length = st->vlint.value; @@ -960,8 +961,9 @@ ngx_http_v3_parse_control(ngx_connection_t *c, void *data, u_char ch) case sw_first_type: case sw_type: - if (ngx_http_v3_parse_varlen_int(c, &st->vlint, ch) != NGX_DONE) { - break; + rc = ngx_http_v3_parse_varlen_int(c, &st->vlint, ch); + if (rc != NGX_DONE) { + return rc; } st->type = st->vlint.value; @@ -980,8 +982,9 @@ ngx_http_v3_parse_control(ngx_connection_t *c, void *data, u_char ch) case sw_length: - if (ngx_http_v3_parse_varlen_int(c, &st->vlint, ch) != NGX_DONE) { - break; + rc = ngx_http_v3_parse_varlen_int(c, &st->vlint, ch); + if (rc != NGX_DONE) { + return rc; } ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0, @@ -1037,8 +1040,9 @@ ngx_http_v3_parse_control(ngx_connection_t *c, void *data, u_char ch) case sw_max_push_id: - if (ngx_http_v3_parse_varlen_int(c, &st->vlint, ch) != NGX_DONE) { - break; + rc = ngx_http_v3_parse_varlen_int(c, &st->vlint, ch); + if (rc != NGX_DONE) { + return rc; } ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0, @@ -1064,6 +1068,7 @@ ngx_int_t ngx_http_v3_parse_settings(ngx_connection_t *c, ngx_http_v3_parse_settings_t *st, u_char ch) { + ngx_int_t rc; enum { sw_start = 0, sw_id, @@ -1082,8 +1087,9 @@ ngx_http_v3_parse_settings(ngx_connection_t *c, case sw_id: - if (ngx_http_v3_parse_varlen_int(c, &st->vlint, ch) != NGX_DONE) { - break; + rc = ngx_http_v3_parse_varlen_int(c, &st->vlint, ch); + if (rc != NGX_DONE) { + return rc; } st->id = st->vlint.value; @@ -1092,8 +1098,9 @@ ngx_http_v3_parse_settings(ngx_connection_t *c, case sw_value: - if (ngx_http_v3_parse_varlen_int(c, &st->vlint, ch) != NGX_DONE) { - break; + rc = ngx_http_v3_parse_varlen_int(c, &st->vlint, ch); + if (rc != NGX_DONE) { + return rc; } if (ngx_http_v3_set_param(c, st->id, st->vlint.value) != NGX_OK) { @@ -1512,6 +1519,7 @@ ngx_int_t ngx_http_v3_parse_data(ngx_connection_t *c, ngx_http_v3_parse_data_t *st, u_char ch) { + ngx_int_t rc; enum { sw_start = 0, sw_type, @@ -1530,8 +1538,9 @@ ngx_http_v3_parse_data(ngx_connection_t *c, ngx_http_v3_parse_data_t *st, case sw_type: - if (ngx_http_v3_parse_varlen_int(c, &st->vlint, ch) != NGX_DONE) { - break; + rc = ngx_http_v3_parse_varlen_int(c, &st->vlint, ch); + if (rc != NGX_DONE) { + return rc; } if (st->vlint.value != NGX_HTTP_V3_FRAME_DATA) { @@ -1543,8 +1552,9 @@ ngx_http_v3_parse_data(ngx_connection_t *c, ngx_http_v3_parse_data_t *st, case sw_length: - if (ngx_http_v3_parse_varlen_int(c, &st->vlint, ch) != NGX_DONE) { - break; + rc = ngx_http_v3_parse_varlen_int(c, &st->vlint, ch); + if (rc != NGX_DONE) { + return rc; } st->length = st->vlint.value; |