Skip to content

Commit 716d3c8

Browse files
author
Martyn Jarvis
committed
Add "fall through" comments
Without these comments gcc7 will complain (-Wimplicit-fallthrough). This fixes arut#1109.
1 parent 43f1e42 commit 716d3c8

File tree

6 files changed

+10
-1
lines changed

6 files changed

+10
-1
lines changed

hls/ngx_rtmp_hls_module.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1951,6 +1951,7 @@ ngx_rtmp_hls_video(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
19511951
ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
19521952
"hls: error appending AUD NAL");
19531953
}
1954+
/* fall through */
19541955
case 9:
19551956
aud_sent = 1;
19561957
break;

ngx_rtmp_access_module.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -410,8 +410,8 @@ ngx_rtmp_access_rule(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
410410
break;
411411
}
412412

413-
/* "all" passes through */
414413
#endif
414+
/* fall through */
415415

416416
default: /* AF_INET */
417417

ngx_rtmp_amf.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,7 @@ ngx_rtmp_amf_read(ngx_rtmp_amf_ctx_t *ctx, ngx_rtmp_amf_elt_t *elts,
331331
if (elts->type & NGX_RTMP_AMF_OPTIONAL) {
332332
return NGX_OK;
333333
}
334+
/* fall through */
334335
case NGX_ERROR:
335336
return NGX_ERROR;
336337
}
@@ -398,6 +399,7 @@ ngx_rtmp_amf_read(ngx_rtmp_amf_ctx_t *ctx, ngx_rtmp_amf_elt_t *elts,
398399
if (ngx_rtmp_amf_get(ctx, &max_index, 4) != NGX_OK) {
399400
return NGX_ERROR;
400401
}
402+
/* fall through */
401403

402404
case NGX_RTMP_AMF_OBJECT:
403405
if (ngx_rtmp_amf_read_object(ctx, data,
@@ -592,6 +594,7 @@ ngx_rtmp_amf_write(ngx_rtmp_amf_ctx_t *ctx,
592594
if (ngx_rtmp_amf_put(ctx, &max_index, 4) != NGX_OK) {
593595
return NGX_ERROR;
594596
}
597+
/* fall through */
595598

596599
case NGX_RTMP_AMF_OBJECT:
597600
type8 = NGX_RTMP_AMF_END;

ngx_rtmp_eval.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ ngx_rtmp_eval(void *ctx, ngx_str_t *in, ngx_rtmp_eval_t **e, ngx_str_t *out,
154154

155155
name.len = p - name.data;
156156
ngx_rtmp_eval_append_var(ctx, &b, e, &name, log);
157+
/* fall through */
157158

158159
case NORMAL:
159160
switch (c) {

ngx_rtmp_init.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ ngx_rtmp_init_connection(ngx_connection_t *c)
7979

8080
case AF_UNIX:
8181
unix_socket = 1;
82+
/* fall through */
8283

8384
default: /* AF_INET */
8485
sin = (struct sockaddr_in *) sa;
@@ -110,6 +111,7 @@ ngx_rtmp_init_connection(ngx_connection_t *c)
110111

111112
case AF_UNIX:
112113
unix_socket = 1;
114+
/* fall through */
113115

114116
default: /* AF_INET */
115117
addr = port->addrs;

ngx_rtmp_notify_module.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -892,6 +892,7 @@ ngx_rtmp_notify_parse_http_header(ngx_rtmp_session_t *s,
892892

893893
n = 0;
894894
state = parse_name;
895+
/* fall through */
895896

896897
case parse_name:
897898
switch (c) {
@@ -919,6 +920,7 @@ ngx_rtmp_notify_parse_http_header(ngx_rtmp_session_t *s,
919920
break;
920921
}
921922
state = parse_value;
923+
/* fall through */
922924

923925
case parse_value:
924926
if (c == '\n') {

0 commit comments

Comments
 (0)