Skip to content

Commit e9bb1d2

Browse files
committed
remove unreachable breaks
1 parent f102735 commit e9bb1d2

26 files changed

Lines changed: 0 additions & 76 deletions

File tree

ext/bz2/bz2.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -594,10 +594,8 @@ static void php_bz2_error(INTERNAL_FUNCTION_PARAMETERS, int opt)
594594
switch (opt) {
595595
case PHP_BZ_ERRNO:
596596
RETURN_LONG(errnum);
597-
break;
598597
case PHP_BZ_ERRSTR:
599598
RETURN_STRING((char*)errstr);
600-
break;
601599
case PHP_BZ_ERRBOTH:
602600
array_init(return_value);
603601

ext/calendar/calendar.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -574,14 +574,11 @@ PHP_FUNCTION(jddayofweek)
574574
switch (mode) {
575575
case CAL_DOW_LONG:
576576
RETURN_STRING(daynamel);
577-
break;
578577
case CAL_DOW_SHORT:
579578
RETURN_STRING(daynames);
580-
break;
581579
case CAL_DOW_DAYNO:
582580
default:
583581
RETURN_LONG(day);
584-
break;
585582
}
586583
}
587584
/* }}} */

ext/date/php_date.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4266,10 +4266,8 @@ PHP_FUNCTION(timezone_offset_get)
42664266
break;
42674267
case TIMELIB_ZONETYPE_OFFSET:
42684268
RETURN_LONG(tzobj->tzi.utc_offset);
4269-
break;
42704269
case TIMELIB_ZONETYPE_ABBR:
42714270
RETURN_LONG(tzobj->tzi.z.utc_offset + (tzobj->tzi.z.dst * 3600));
4272-
break;
42734271
}
42744272
}
42754273
/* }}} */
@@ -5545,10 +5543,8 @@ static void php_do_date_sunrise_sunset(INTERNAL_FUNCTION_PARAMETERS, bool calc_s
55455543
case SUNFUNCS_RET_STRING:
55465544
retstr = strpprintf(0, "%02d:%02d", (int) N, (int) (60 * (N - (int) N)));
55475545
RETURN_NEW_STR(retstr);
5548-
break;
55495546
case SUNFUNCS_RET_DOUBLE:
55505547
RETURN_DOUBLE(N);
5551-
break;
55525548
}
55535549
}
55545550
/* }}} */

ext/exif/exif.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4026,7 +4026,6 @@ static bool exif_scan_thumbnail(image_info_type *ImageInfo)
40264026
case M_EOI:
40274027
exif_error_docref(NULL EXIFERR_CC, ImageInfo, E_WARNING, "Could not compute size of thumbnail");
40284028
return false;
4029-
break;
40304029

40314030
default:
40324031
/* just skip */

ext/ffi/ffi.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2090,7 +2090,6 @@ static HashTable *zend_ffi_cdata_get_debug_info(zend_object *obj, int *is_temp)
20902090
zend_hash_str_add(ht, "cdata", sizeof("cdata")-1, &tmp);
20912091
*is_temp = 1;
20922092
return ht;
2093-
break;
20942093
case ZEND_FFI_TYPE_POINTER:
20952094
if (*(void**)ptr == NULL) {
20962095
ZVAL_NULL(&tmp);
@@ -2145,7 +2144,6 @@ static HashTable *zend_ffi_cdata_get_debug_info(zend_object *obj, int *is_temp)
21452144
// TODO: function name ???
21462145
*is_temp = 1;
21472146
return ht;
2148-
break;
21492147
default:
21502148
ZEND_UNREACHABLE();
21512149
break;
@@ -7084,7 +7082,6 @@ static zend_result zend_ffi_nested_type(zend_ffi_type *type, zend_ffi_type *nest
70847082
nested_type->size = nested_type->array.length * ZEND_FFI_TYPE(nested_type->array.type)->size;
70857083
nested_type->align = ZEND_FFI_TYPE(nested_type->array.type)->align;
70867084
return SUCCESS;
7087-
break;
70887085
case ZEND_FFI_TYPE_FUNC:
70897086
/* "char" is used as a terminator of nested declaration */
70907087
if (nested_type->func.ret_type == &zend_ffi_type_char) {

ext/gd/gd.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -764,19 +764,15 @@ PHP_FUNCTION(imagecolormatch)
764764
case -1:
765765
zend_argument_value_error(1, "must be TrueColor");
766766
RETURN_THROWS();
767-
break;
768767
case -2:
769768
zend_argument_value_error(2, "must be Palette");
770769
RETURN_THROWS();
771-
break;
772770
case -3:
773771
zend_argument_value_error(2, "must be the same size as argument #1 ($im1)");
774772
RETURN_THROWS();
775-
break;
776773
case -4:
777774
zend_argument_value_error(2, "must have at least one color");
778775
RETURN_THROWS();
779-
break;
780776
}
781777

782778
RETURN_TRUE;

ext/gd/libgd/gd_bmp.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -695,7 +695,6 @@ static int bmp_read_direct(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t *info, b
695695
}
696696
BMP_DEBUG(printf("Currently no bitfield support\n"));
697697
return 1;
698-
break;
699698

700699
case BMP_BI_RLE8:
701700
if (info->depth != 8) {

ext/gd/libgd/gd_interpolation.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1802,7 +1802,6 @@ gdImagePtr gdImageRotateInterpolated(const gdImagePtr src, const float angle, in
18021802
switch (src->interpolation_id) {
18031803
case GD_NEAREST_NEIGHBOUR:
18041804
return gdImageRotateNearestNeighbour(src, angle, bgcolor);
1805-
break;
18061805

18071806
case GD_BILINEAR_FIXED:
18081807
case GD_BICUBIC_FIXED:

ext/gd/libgd/gd_jpeg.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -111,23 +111,18 @@ const char * gdJpegGetVersionString()
111111
switch(JPEG_LIB_VERSION) {
112112
case 62:
113113
return "6b";
114-
break;
115114

116115
case 70:
117116
return "7";
118-
break;
119117

120118
case 80:
121119
return "8";
122-
break;
123120

124121
case 90:
125122
return "9 compatible";
126-
break;
127123

128124
case 100:
129125
return "10 compatible";
130-
break;
131126

132127
default:
133128
return "unknown";

ext/intl/normalizer/normalizer_normalize.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,19 +37,14 @@ static const UNormalizer2 *intl_get_normalizer(zend_long form, UErrorCode *err)
3737
{
3838
case NORMALIZER_FORM_C:
3939
return unorm2_getNFCInstance(err);
40-
break;
4140
case NORMALIZER_FORM_D:
4241
return unorm2_getNFDInstance(err);
43-
break;
4442
case NORMALIZER_FORM_KC:
4543
return unorm2_getNFKCInstance(err);
46-
break;
4744
case NORMALIZER_FORM_KD:
4845
return unorm2_getNFKDInstance(err);
49-
break;
5046
case NORMALIZER_FORM_KC_CF:
5147
return unorm2_getNFKCCasefoldInstance(err);
52-
break;
5348
}
5449

5550
*err = U_ILLEGAL_ARGUMENT_ERROR;

0 commit comments

Comments
 (0)