Skip to content

Commit 2918cae

Browse files
LamentXU123LamentXU123
authored
ext/*: Remove break after return (php#21485)
1 parent d34c840 commit 2918cae

File tree

26 files changed

+0
-90
lines changed

26 files changed

+0
-90
lines changed

‎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/enchant/enchant.c‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -346,12 +346,10 @@ PHP_FUNCTION(enchant_broker_set_dict_path)
346346
case PHP_ENCHANT_MYSPELL:
347347
enchant_broker_set_param(pbroker->pbroker, "enchant.myspell.dictionary.path", value);
348348
RETURN_TRUE;
349-
break;
350349

351350
case PHP_ENCHANT_ISPELL:
352351
enchant_broker_set_param(pbroker->pbroker, "enchant.ispell.dictionary.path", value);
353352
RETURN_TRUE;
354-
break;
355353

356354
default:
357355
RETURN_FALSE;

‎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
@@ -2086,7 +2086,6 @@ static HashTable *zend_ffi_cdata_get_debug_info(zend_object *obj, int *is_temp)
20862086
zend_hash_str_add(ht, "cdata", sizeof("cdata")-1, &tmp);
20872087
*is_temp = 1;
20882088
return ht;
2089-
break;
20902089
case ZEND_FFI_TYPE_POINTER:
20912090
if (*(void**)ptr == NULL) {
20922091
ZVAL_NULL(&tmp);
@@ -2141,7 +2140,6 @@ static HashTable *zend_ffi_cdata_get_debug_info(zend_object *obj, int *is_temp)
21412140
// TODO: function name ???
21422141
*is_temp = 1;
21432142
return ht;
2144-
break;
21452143
default:
21462144
ZEND_UNREACHABLE();
21472145
break;
@@ -7086,7 +7084,6 @@ static zend_result zend_ffi_nested_type(zend_ffi_type *type, zend_ffi_type *nest
70867084
nested_type->size = nested_type->array.length * ZEND_FFI_TYPE(nested_type->array.type)->size;
70877085
nested_type->align = ZEND_FFI_TYPE(nested_type->array.type)->align;
70887086
return SUCCESS;
7089-
break;
70907087
case ZEND_FFI_TYPE_FUNC:
70917088
/* "char" is used as a terminator of nested declaration */
70927089
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/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;

‎ext/odbc/php_odbc.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1667,7 +1667,6 @@ PHP_FUNCTION(odbc_result)
16671667
}
16681668
ZSTR_VAL(field_str)[ZSTR_LEN(field_str)] = '\0';
16691669
RETURN_NEW_STR(field_str);
1670-
break;
16711670

16721671
default:
16731672
if (result->values[field_ind].vallen == SQL_NULL_DATA) {

‎ext/opcache/ZendAccelerator.c‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3323,15 +3323,13 @@ static zend_result accel_post_startup(void)
33233323
accel_startup_ok = false;
33243324
zend_accel_error_noreturn(ACCEL_LOG_FATAL, "Failure to initialize shared memory structures - cannot reattach to exiting shared memory.");
33253325
return SUCCESS;
3326-
break;
33273326
#if ENABLE_FILE_CACHE_FALLBACK
33283327
case ALLOC_FALLBACK:
33293328
zend_shared_alloc_lock();
33303329
file_cache_only = true;
33313330
fallback_process = true;
33323331
zend_shared_alloc_unlock();
33333332
goto file_cache_fallback;
3334-
break;
33353333
#endif
33363334
}
33373335

0 commit comments

Comments
 (0)