Skip to content

Commit 1b5f3f1

Browse files
GirgiasGirgias
committed
Use ZEND_FALLTHROUGH; instead
1 parent 69f9198 commit 1b5f3f1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+212
-212
lines changed

‎Zend/zend_API.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -884,7 +884,7 @@ static const char *zend_parse_arg_impl(zval *arg, va_list *va, const char **spec
884884
case 'Z': /* replace with 'z' */
885885
case 'L': /* replace with 'l' */
886886
ZEND_ASSERT(0 && "ZPP modifier no longer supported");
887-
fallthrough;
887+
ZEND_FALLTHROUGH;
888888
default:
889889
return "unknown";
890890
}

‎Zend/zend_ast.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2013,7 +2013,7 @@ static ZEND_COLD void zend_ast_export_ex(smart_str *str, zend_ast *ast, int prio
20132013
break;
20142014
case ZEND_AST_PROP_ELEM:
20152015
smart_str_appendc(str, '$');
2016-
fallthrough;
2016+
ZEND_FALLTHROUGH;
20172017
case ZEND_AST_CONST_ELEM:
20182018
zend_ast_export_name(str, ast->child[0], 0, indent);
20192019
APPEND_DEFAULT_VALUE(1);

‎Zend/zend_builtin_functions.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,7 @@ ZEND_FUNCTION(define)
528528
val = &val_free;
529529
break;
530530
}
531-
fallthrough;
531+
ZEND_FALLTHROUGH;
532532
default:
533533
zval_ptr_dtor(&val_free);
534534
zend_argument_type_error(2, "cannot be an object, %s given", zend_zval_type_name(val));

‎Zend/zend_execute.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ static zend_never_inline ZEND_COLD zval *_get_zval_cv_lookup(zval *ptr, uint32_t
298298
break;
299299
case BP_VAR_RW:
300300
zval_undefined_cv(var EXECUTE_DATA_CC);
301-
fallthrough;
301+
ZEND_FALLTHROUGH;
302302
case BP_VAR_W:
303303
ZVAL_NULL(ptr);
304304
break;
@@ -1374,7 +1374,7 @@ static zend_never_inline zend_long zend_check_string_offset(zval *dim, int type
13741374
}
13751375
case IS_UNDEF:
13761376
ZVAL_UNDEFINED_OP2();
1377-
fallthrough;
1377+
ZEND_FALLTHROUGH;
13781378
case IS_DOUBLE:
13791379
case IS_NULL:
13801380
case IS_FALSE:
@@ -2038,7 +2038,7 @@ static zend_never_inline zend_uchar slow_index_convert(HashTable *ht, const zval
20382038
if (EG(exception)) {
20392039
return IS_NULL;
20402040
}
2041-
fallthrough;
2041+
ZEND_FALLTHROUGH;
20422042
}
20432043
case IS_NULL:
20442044
value->str = ZSTR_EMPTY_ALLOC();
@@ -2078,7 +2078,7 @@ static zend_always_inline zval *zend_fetch_dimension_address_inner(HashTable *ht
20782078
switch (type) {
20792079
case BP_VAR_R:
20802080
zend_undefined_offset(hval);
2081-
fallthrough;
2081+
ZEND_FALLTHROUGH;
20822082
case BP_VAR_UNSET:
20832083
case BP_VAR_IS:
20842084
retval = &EG(uninitialized_zval);
@@ -2087,7 +2087,7 @@ static zend_always_inline zval *zend_fetch_dimension_address_inner(HashTable *ht
20872087
if (UNEXPECTED(zend_undefined_offset_write(ht, hval) == FAILURE)) {
20882088
return NULL;
20892089
}
2090-
fallthrough;
2090+
ZEND_FALLTHROUGH;
20912091
case BP_VAR_W:
20922092
retval = zend_hash_index_add_new(ht, hval, &EG(uninitialized_zval));
20932093
break;
@@ -2105,7 +2105,7 @@ static zend_always_inline zval *zend_fetch_dimension_address_inner(HashTable *ht
21052105
switch (type) {
21062106
case BP_VAR_R:
21072107
zend_undefined_index(offset_key);
2108-
fallthrough;
2108+
ZEND_FALLTHROUGH;
21092109
case BP_VAR_UNSET:
21102110
case BP_VAR_IS:
21112111
retval = &EG(uninitialized_zval);
@@ -2343,7 +2343,7 @@ static zend_always_inline void zend_fetch_dimension_address_read(zval *result, z
23432343
}
23442344
case IS_UNDEF:
23452345
ZVAL_UNDEFINED_OP2();
2346-
fallthrough;
2346+
ZEND_FALLTHROUGH;
23472347
case IS_DOUBLE:
23482348
case IS_NULL:
23492349
case IS_FALSE:

‎Zend/zend_highlight.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ ZEND_API void zend_strip(void)
184184
zend_write(" ", sizeof(" ") - 1);
185185
prev_space = 1;
186186
}
187-
fallthrough;
187+
ZEND_FALLTHROUGH;
188188
case T_COMMENT:
189189
case T_DOC_COMMENT:
190190
ZVAL_UNDEF(&token);

‎Zend/zend_ini_scanner.l

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ static void zend_ini_copy_typed_value(zval *retval, const int type, const char *
187187
if (convert_to_number(retval, str, len) == SUCCESS) {
188188
break;
189189
}
190-
fallthrough;
190+
ZEND_FALLTHROUGH;
191191
default:
192192
zend_ini_copy_value(retval, str, len);
193193
}
@@ -329,7 +329,7 @@ static void zend_ini_escape_string(zval *lval, char *str, int len, char quote_ty
329329
*t++ = *s;
330330
break;
331331
}
332-
fallthrough;
332+
ZEND_FALLTHROUGH;
333333
case '\\':
334334
case '$':
335335
*t++ = *s;
@@ -608,7 +608,7 @@ end_raw_value_chars:
608608
if (YYCURSOR < YYLIMIT && *YYCURSOR != '"') {
609609
YYCURSOR++;
610610
}
611-
fallthrough;
611+
ZEND_FALLTHROUGH;
612612
default:
613613
continue;
614614
}

‎Zend/zend_language_scanner.l

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -992,7 +992,7 @@ static zend_result zend_scan_escape_string(zval *zendlval, char *str, int len, c
992992
*t++ = *s;
993993
break;
994994
}
995-
fallthrough;
995+
ZEND_FALLTHROUGH;
996996
case '\\':
997997
case '$':
998998
*t++ = *s;
@@ -2367,7 +2367,7 @@ inline_char_handler:
23672367
YYCURSOR--;
23682368
break;
23692369
}
2370-
fallthrough;
2370+
ZEND_FALLTHROUGH;
23712371
default:
23722372
continue;
23732373
}
@@ -2550,7 +2550,7 @@ skip_escape_conversion:
25502550
if (YYCURSOR < YYLIMIT) {
25512551
YYCURSOR++;
25522552
}
2553-
fallthrough;
2553+
ZEND_FALLTHROUGH;
25542554
default:
25552555
continue;
25562556
}
@@ -2787,7 +2787,7 @@ skip_escape_conversion:
27872787
if (YYCURSOR < YYLIMIT) {
27882788
YYCURSOR++;
27892789
}
2790-
fallthrough;
2790+
ZEND_FALLTHROUGH;
27912791
default:
27922792
continue;
27932793
}
@@ -2834,7 +2834,7 @@ double_quotes_scan_done:
28342834
if (YYCURSOR < YYLIMIT) {
28352835
YYCURSOR++;
28362836
}
2837-
fallthrough;
2837+
ZEND_FALLTHROUGH;
28382838
default:
28392839
continue;
28402840
}
@@ -2870,7 +2870,7 @@ double_quotes_scan_done:
28702870
if (*YYCURSOR == '\n') {
28712871
YYCURSOR++;
28722872
}
2873-
fallthrough;
2873+
ZEND_FALLTHROUGH;
28742874
case '\n':
28752875
indentation = spacing = 0;
28762876
@@ -2940,7 +2940,7 @@ double_quotes_scan_done:
29402940
if (YYCURSOR < YYLIMIT && *YYCURSOR != '\n' && *YYCURSOR != '\r') {
29412941
YYCURSOR++;
29422942
}
2943-
fallthrough;
2943+
ZEND_FALLTHROUGH;
29442944
default:
29452945
continue;
29462946
}
@@ -2994,7 +2994,7 @@ heredoc_scan_done:
29942994
if (*YYCURSOR == '\n') {
29952995
YYCURSOR++;
29962996
}
2997-
fallthrough;
2997+
ZEND_FALLTHROUGH;
29982998
case '\n':
29992999
indentation = spacing = 0;
30003000
@@ -3045,7 +3045,7 @@ heredoc_scan_done:
30453045
30463046
goto nowdoc_scan_done;
30473047
}
3048-
fallthrough;
3048+
ZEND_FALLTHROUGH;
30493049
default:
30503050
continue;
30513051
}

‎Zend/zend_object_handlers.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1782,7 +1782,7 @@ ZEND_API HashTable *zend_std_get_properties_for(zend_object *obj, zend_prop_purp
17821782
}
17831783
return ht;
17841784
}
1785-
fallthrough;
1785+
ZEND_FALLTHROUGH;
17861786
case ZEND_PROP_PURPOSE_ARRAY_CAST:
17871787
case ZEND_PROP_PURPOSE_SERIALIZE:
17881788
case ZEND_PROP_PURPOSE_VAR_EXPORT:

‎Zend/zend_opcode.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -704,7 +704,7 @@ static void emit_live_range(
704704
return;
705705
}
706706
}
707-
fallthrough;
707+
ZEND_FALLTHROUGH;
708708
default:
709709
start++;
710710
kind = ZEND_LIVE_TMPVAR;
@@ -994,14 +994,14 @@ ZEND_API void pass_two(zend_op_array *op_array)
994994
if (op_array->fn_flags & ZEND_ACC_HAS_FINALLY_BLOCK) {
995995
zend_check_finally_breakout(op_array, opline - op_array->opcodes, opline->op1.opline_num);
996996
}
997-
fallthrough;
997+
ZEND_FALLTHROUGH;
998998
case ZEND_JMP:
999999
ZEND_PASS_TWO_UPDATE_JMP_TARGET(op_array, opline, opline->op1);
10001000
break;
10011001
case ZEND_JMPZNZ:
10021002
/* absolute index to relative offset */
10031003
opline->extended_value = ZEND_OPLINE_NUM_TO_OFFSET(op_array, opline, opline->extended_value);
1004-
fallthrough;
1004+
ZEND_FALLTHROUGH;
10051005
case ZEND_JMPZ:
10061006
case ZEND_JMPNZ:
10071007
case ZEND_JMPZ_EX:

‎Zend/zend_operators.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,11 @@ ZEND_API int ZEND_FASTCALL zend_atoi(const char *str, size_t str_len) /* {{{ */
9595
case 'g':
9696
case 'G':
9797
retval *= 1024;
98-
fallthrough;
98+
ZEND_FALLTHROUGH;
9999
case 'm':
100100
case 'M':
101101
retval *= 1024;
102-
fallthrough;
102+
ZEND_FALLTHROUGH;
103103
case 'k':
104104
case 'K':
105105
retval *= 1024;
@@ -123,11 +123,11 @@ ZEND_API zend_long ZEND_FASTCALL zend_atol(const char *str, size_t str_len) /* {
123123
case 'g':
124124
case 'G':
125125
retval *= 1024;
126-
fallthrough;
126+
ZEND_FALLTHROUGH;
127127
case 'm':
128128
case 'M':
129129
retval *= 1024;
130-
fallthrough;
130+
ZEND_FALLTHROUGH;
131131
case 'k':
132132
case 'K':
133133
retval *= 1024;
@@ -2455,7 +2455,7 @@ ZEND_API zend_result ZEND_FASTCALL increment_function(zval *op1) /* {{{ */
24552455
return SUCCESS;
24562456
}
24572457
}
2458-
fallthrough;
2458+
ZEND_FALLTHROUGH;
24592459
case IS_RESOURCE:
24602460
case IS_ARRAY:
24612461
zend_type_error("Cannot increment %s", zend_zval_type_name(op1));
@@ -2517,7 +2517,7 @@ ZEND_API zend_result ZEND_FASTCALL decrement_function(zval *op1) /* {{{ */
25172517
return SUCCESS;
25182518
}
25192519
}
2520-
fallthrough;
2520+
ZEND_FALLTHROUGH;
25212521
case IS_RESOURCE:
25222522
case IS_ARRAY:
25232523
zend_type_error("Cannot decrement %s", zend_zval_type_name(op1));

‎Zend/zend_strtod.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1911,7 +1911,7 @@ gethex( CONST char **sp, U *rvp, int rounding, int sign)
19111911
switch(*++s) {
19121912
case '-':
19131913
esign = 1;
1914-
fallthrough;
1914+
ZEND_FALLTHROUGH;
19151915
case '+':
19161916
s++;
19171917
}
@@ -2578,11 +2578,11 @@ zend_strtod
25782578
for(s = s00;;s++) switch(*s) {
25792579
case '-':
25802580
sign = 1;
2581-
fallthrough;
2581+
ZEND_FALLTHROUGH;
25822582
case '+':
25832583
if (*++s)
25842584
goto break2;
2585-
fallthrough;
2585+
ZEND_FALLTHROUGH;
25862586
case 0:
25872587
goto ret0;
25882588
case '\t':
@@ -2698,7 +2698,7 @@ zend_strtod
26982698
switch(c = *++s) {
26992699
case '-':
27002700
esign = 1;
2701-
fallthrough;
2701+
ZEND_FALLTHROUGH;
27022702
case '+':
27032703
c = *++s;
27042704
}
@@ -3953,15 +3953,15 @@ zend_dtoa
39533953
break;
39543954
case 2:
39553955
leftright = 0;
3956-
fallthrough;
3956+
ZEND_FALLTHROUGH;
39573957
case 4:
39583958
if (ndigits <= 0)
39593959
ndigits = 1;
39603960
ilim = ilim1 = i = ndigits;
39613961
break;
39623962
case 3:
39633963
leftright = 0;
3964-
fallthrough;
3964+
ZEND_FALLTHROUGH;
39653965
case 5:
39663966
i = ndigits + k + 1;
39673967
ilim = i;

‎Zend/zend_virtual_cwd.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1673,7 +1673,7 @@ CWD_API FILE *virtual_popen(const char *command, const char *type) /* {{{ */
16731673
*ptr++ = '\'';
16741674
*ptr++ = '\\';
16751675
*ptr++ = '\'';
1676-
fallthrough;
1676+
ZEND_FALLTHROUGH;
16771677
default:
16781678
*ptr++ = *dir;
16791679
}

‎ext/curl/interface.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2184,7 +2184,7 @@ static int _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue, bool i
21842184
error = curl_easy_setopt(ch->cp, option, 2);
21852185
break;
21862186
}
2187-
fallthrough;
2187+
ZEND_FALLTHROUGH;
21882188
case CURLOPT_AUTOREFERER:
21892189
case CURLOPT_BUFFERSIZE:
21902190
case CURLOPT_CONNECTTIMEOUT:
@@ -2572,7 +2572,7 @@ static int _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue, bool i
25722572
zend_value_error("%s(): The provided file handle must be writable", get_active_function_name());
25732573
return FAILURE;
25742574
}
2575-
fallthrough;
2575+
ZEND_FALLTHROUGH;
25762576
default:
25772577
error = curl_easy_setopt(ch->cp, option, fp);
25782578
break;

‎ext/date/php_date.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -713,8 +713,8 @@ static zend_string *date_format(const char *format, size_t format_len, timelib_t
713713
length = slprintf(buffer, sizeof(buffer), "%s", "Z");
714714
break;
715715
}
716-
fallthrough;
717-
case 'P': rfc_colon = 1; fallthrough;
716+
ZEND_FALLTHROUGH;
717+
case 'P': rfc_colon = 1; ZEND_FALLTHROUGH;
718718
case 'O': length = slprintf(buffer, sizeof(buffer), "%c%02d%s%02d",
719719
localtime ? ((offset->offset < 0) ? '-' : '+') : '+',
720720
localtime ? abs(offset->offset / 3600) : 0,
@@ -765,7 +765,7 @@ static zend_string *date_format(const char *format, size_t format_len, timelib_t
765765
break;
766766
case 'U': length = slprintf(buffer, sizeof(buffer), "%lld", (timelib_sll) t->sse); break;
767767

768-
case '\\': if (i < format_len) i++; fallthrough;
768+
case '\\': if (i < format_len) i++; ZEND_FALLTHROUGH;
769769

770770
default: buffer[0] = format[i]; buffer[1] = '\0'; length = 1; break;
771771
}

‎ext/dba/dba.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,7 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, int persistent)
637637
lock_flag = (hptr->flags & DBA_LOCK_ALL);
638638
break;
639639
}
640-
fallthrough;
640+
ZEND_FALLTHROUGH;
641641
case 'l':
642642
lock_flag = DBA_LOCK_ALL;
643643
if ((hptr->flags & DBA_LOCK_ALL) == 0) {

0 commit comments

Comments
 (0)