diff --git a/ext/bz2/bz2.c b/ext/bz2/bz2.c index 91e694f58f4..2299e827208 100644 --- a/ext/bz2/bz2.c +++ b/ext/bz2/bz2.c @@ -594,10 +594,8 @@ static void php_bz2_error(INTERNAL_FUNCTION_PARAMETERS, int opt) switch (opt) { case PHP_BZ_ERRNO: RETURN_LONG(errnum); - break; case PHP_BZ_ERRSTR: RETURN_STRING((char*)errstr); - break; case PHP_BZ_ERRBOTH: array_init(return_value); diff --git a/ext/calendar/calendar.c b/ext/calendar/calendar.c index b90e461da49..0330e60e51a 100644 --- a/ext/calendar/calendar.c +++ b/ext/calendar/calendar.c @@ -574,14 +574,11 @@ PHP_FUNCTION(jddayofweek) switch (mode) { case CAL_DOW_LONG: RETURN_STRING(daynamel); - break; case CAL_DOW_SHORT: RETURN_STRING(daynames); - break; case CAL_DOW_DAYNO: default: RETURN_LONG(day); - break; } } /* }}} */ diff --git a/ext/date/php_date.c b/ext/date/php_date.c index ddc7d315784..dd80e15e9cf 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -4266,10 +4266,8 @@ PHP_FUNCTION(timezone_offset_get) break; case TIMELIB_ZONETYPE_OFFSET: RETURN_LONG(tzobj->tzi.utc_offset); - break; case TIMELIB_ZONETYPE_ABBR: RETURN_LONG(tzobj->tzi.z.utc_offset + (tzobj->tzi.z.dst * 3600)); - break; } } /* }}} */ @@ -5545,10 +5543,8 @@ static void php_do_date_sunrise_sunset(INTERNAL_FUNCTION_PARAMETERS, bool calc_s case SUNFUNCS_RET_STRING: retstr = strpprintf(0, "%02d:%02d", (int) N, (int) (60 * (N - (int) N))); RETURN_NEW_STR(retstr); - break; case SUNFUNCS_RET_DOUBLE: RETURN_DOUBLE(N); - break; } } /* }}} */ diff --git a/ext/enchant/enchant.c b/ext/enchant/enchant.c index 43547ab9b5d..dd359527bee 100644 --- a/ext/enchant/enchant.c +++ b/ext/enchant/enchant.c @@ -346,12 +346,10 @@ PHP_FUNCTION(enchant_broker_set_dict_path) case PHP_ENCHANT_MYSPELL: enchant_broker_set_param(pbroker->pbroker, "enchant.myspell.dictionary.path", value); RETURN_TRUE; - break; case PHP_ENCHANT_ISPELL: enchant_broker_set_param(pbroker->pbroker, "enchant.ispell.dictionary.path", value); RETURN_TRUE; - break; default: RETURN_FALSE; diff --git a/ext/exif/exif.c b/ext/exif/exif.c index 17dadc7539b..904abede8f0 100644 --- a/ext/exif/exif.c +++ b/ext/exif/exif.c @@ -4026,7 +4026,6 @@ static bool exif_scan_thumbnail(image_info_type *ImageInfo) case M_EOI: exif_error_docref(NULL EXIFERR_CC, ImageInfo, E_WARNING, "Could not compute size of thumbnail"); return false; - break; default: /* just skip */ diff --git a/ext/ffi/ffi.c b/ext/ffi/ffi.c index eaceed50c1c..1650d0c5906 100644 --- a/ext/ffi/ffi.c +++ b/ext/ffi/ffi.c @@ -2086,7 +2086,6 @@ static HashTable *zend_ffi_cdata_get_debug_info(zend_object *obj, int *is_temp) zend_hash_str_add(ht, "cdata", sizeof("cdata")-1, &tmp); *is_temp = 1; return ht; - break; case ZEND_FFI_TYPE_POINTER: if (*(void**)ptr == NULL) { ZVAL_NULL(&tmp); @@ -2141,7 +2140,6 @@ static HashTable *zend_ffi_cdata_get_debug_info(zend_object *obj, int *is_temp) // TODO: function name ??? *is_temp = 1; return ht; - break; default: ZEND_UNREACHABLE(); break; @@ -7086,7 +7084,6 @@ static zend_result zend_ffi_nested_type(zend_ffi_type *type, zend_ffi_type *nest nested_type->size = nested_type->array.length * ZEND_FFI_TYPE(nested_type->array.type)->size; nested_type->align = ZEND_FFI_TYPE(nested_type->array.type)->align; return SUCCESS; - break; case ZEND_FFI_TYPE_FUNC: /* "char" is used as a terminator of nested declaration */ if (nested_type->func.ret_type == &zend_ffi_type_char) { diff --git a/ext/gd/gd.c b/ext/gd/gd.c index 81f442f3334..33b397b4f69 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -764,19 +764,15 @@ PHP_FUNCTION(imagecolormatch) case -1: zend_argument_value_error(1, "must be TrueColor"); RETURN_THROWS(); - break; case -2: zend_argument_value_error(2, "must be Palette"); RETURN_THROWS(); - break; case -3: zend_argument_value_error(2, "must be the same size as argument #1 ($im1)"); RETURN_THROWS(); - break; case -4: zend_argument_value_error(2, "must have at least one color"); RETURN_THROWS(); - break; } RETURN_TRUE; diff --git a/ext/intl/normalizer/normalizer_normalize.cpp b/ext/intl/normalizer/normalizer_normalize.cpp index 92e8f1166ad..9cf809f2718 100644 --- a/ext/intl/normalizer/normalizer_normalize.cpp +++ b/ext/intl/normalizer/normalizer_normalize.cpp @@ -37,19 +37,14 @@ static const UNormalizer2 *intl_get_normalizer(zend_long form, UErrorCode *err) { case NORMALIZER_FORM_C: return unorm2_getNFCInstance(err); - break; case NORMALIZER_FORM_D: return unorm2_getNFDInstance(err); - break; case NORMALIZER_FORM_KC: return unorm2_getNFKCInstance(err); - break; case NORMALIZER_FORM_KD: return unorm2_getNFKDInstance(err); - break; case NORMALIZER_FORM_KC_CF: return unorm2_getNFKCCasefoldInstance(err); - break; } *err = U_ILLEGAL_ARGUMENT_ERROR; diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c index 7eec40aa656..90ccb8af1ed 100644 --- a/ext/odbc/php_odbc.c +++ b/ext/odbc/php_odbc.c @@ -1667,7 +1667,6 @@ PHP_FUNCTION(odbc_result) } ZSTR_VAL(field_str)[ZSTR_LEN(field_str)] = '\0'; RETURN_NEW_STR(field_str); - break; default: if (result->values[field_ind].vallen == SQL_NULL_DATA) { diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c index f4134212bc4..0c6e405d041 100644 --- a/ext/opcache/ZendAccelerator.c +++ b/ext/opcache/ZendAccelerator.c @@ -3323,7 +3323,6 @@ static zend_result accel_post_startup(void) accel_startup_ok = false; zend_accel_error_noreturn(ACCEL_LOG_FATAL, "Failure to initialize shared memory structures - cannot reattach to exiting shared memory."); return SUCCESS; - break; #if ENABLE_FILE_CACHE_FALLBACK case ALLOC_FALLBACK: zend_shared_alloc_lock(); @@ -3331,7 +3330,6 @@ static zend_result accel_post_startup(void) fallback_process = true; zend_shared_alloc_unlock(); goto file_cache_fallback; - break; #endif } diff --git a/ext/openssl/openssl_backend_v1.c b/ext/openssl/openssl_backend_v1.c index 81c327dbfe3..0f254fb5857 100644 --- a/ext/openssl/openssl_backend_v1.c +++ b/ext/openssl/openssl_backend_v1.c @@ -632,7 +632,6 @@ const EVP_MD *php_openssl_get_evp_md_from_algo(zend_long algo) #endif default: return NULL; - break; } return mdtype; } @@ -653,40 +652,31 @@ const EVP_CIPHER *php_openssl_get_evp_cipher_from_algo(zend_long algo) #ifndef OPENSSL_NO_RC2 case PHP_OPENSSL_CIPHER_RC2_40: return EVP_rc2_40_cbc(); - break; case PHP_OPENSSL_CIPHER_RC2_64: return EVP_rc2_64_cbc(); - break; case PHP_OPENSSL_CIPHER_RC2_128: return EVP_rc2_cbc(); - break; #endif #ifndef OPENSSL_NO_DES case PHP_OPENSSL_CIPHER_DES: return EVP_des_cbc(); - break; case PHP_OPENSSL_CIPHER_3DES: return EVP_des_ede3_cbc(); - break; #endif #ifndef OPENSSL_NO_AES case PHP_OPENSSL_CIPHER_AES_128_CBC: return EVP_aes_128_cbc(); - break; case PHP_OPENSSL_CIPHER_AES_192_CBC: return EVP_aes_192_cbc(); - break; case PHP_OPENSSL_CIPHER_AES_256_CBC: return EVP_aes_256_cbc(); - break; #endif default: return NULL; - break; } } diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c index bd174f30095..34b4acd9f1c 100644 --- a/ext/openssl/xp_ssl.c +++ b/ext/openssl/xp_ssl.c @@ -2511,11 +2511,9 @@ static int php_openssl_sockop_set_option(php_stream *stream, int option, int val case STREAM_XPORT_CRYPTO_OP_SETUP: cparam->outputs.returncode = php_openssl_setup_crypto(stream, sslsock, cparam); return PHP_STREAM_OPTION_RETURN_OK; - break; case STREAM_XPORT_CRYPTO_OP_ENABLE: cparam->outputs.returncode = php_openssl_enable_crypto(stream, sslsock, cparam); return PHP_STREAM_OPTION_RETURN_OK; - break; default: /* fall through */ break; diff --git a/ext/pcntl/pcntl.c b/ext/pcntl/pcntl.c index 0ef87fffa28..ab7b1499208 100644 --- a/ext/pcntl/pcntl.c +++ b/ext/pcntl/pcntl.c @@ -1481,7 +1481,6 @@ PHP_FUNCTION(pcntl_unshare) case EINVAL: zend_argument_value_error(1, "must be a combination of CLONE_* flags, or at least one flag is unsupported by the kernel"); RETURN_THROWS(); - break; #endif #ifdef ENOMEM case ENOMEM: diff --git a/ext/pdo_firebird/firebird_driver.c b/ext/pdo_firebird/firebird_driver.c index 76384a18747..c77bf6d7c58 100644 --- a/ext/pdo_firebird/firebird_driver.c +++ b/ext/pdo_firebird/firebird_driver.c @@ -455,7 +455,6 @@ static int php_firebird_preprocess(const zend_string* sql, char* sql_out, HashTa case ttNone: /* Execute statement preprocess SQL error */ return 0; - break; } } return 1; diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c index 2cef31c2871..3f4b606b510 100644 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@ -1212,7 +1212,6 @@ PHP_FUNCTION(pg_query) PHP_PQ_ERROR("Query failed: %s", pgsql); PQclear(pgsql_result); RETURN_FALSE; - break; case PGRES_COMMAND_OK: /* successful command that did not return rows */ default: if (pgsql_result) { @@ -1351,7 +1350,6 @@ PHP_FUNCTION(pg_query_params) PHP_PQ_ERROR("Query failed: %s", pgsql); PQclear(pgsql_result); RETURN_FALSE; - break; case PGRES_COMMAND_OK: /* successful command that did not return rows */ default: if (pgsql_result) { @@ -1437,7 +1435,6 @@ PHP_FUNCTION(pg_prepare) PHP_PQ_ERROR("Query failed: %s", pgsql); PQclear(pgsql_result); RETURN_FALSE; - break; case PGRES_COMMAND_OK: /* successful command that did not return rows */ default: if (pgsql_result) { @@ -1536,7 +1533,6 @@ PHP_FUNCTION(pg_execute) PHP_PQ_ERROR("Query failed: %s", pgsql); PQclear(pgsql_result); RETURN_FALSE; - break; case PGRES_COMMAND_OK: /* successful command that did not return rows */ default: if (pgsql_result) { @@ -1648,7 +1644,6 @@ PHP_FUNCTION(pg_last_notice) zend_hash_clean(notices); } RETURN_TRUE; - break; default: zend_argument_value_error(2, "must be one of PGSQL_NOTICE_LAST, PGSQL_NOTICE_ALL, or PGSQL_NOTICE_CLEAR"); RETURN_THROWS(); @@ -3401,7 +3396,6 @@ PHP_FUNCTION(pg_copy_to) case -2: PHP_PQ_ERROR("getline failed: %s", pgsql); RETURN_FALSE; - break; default: add_next_index_string(return_value, csv); PQfreemem(csv); @@ -3420,7 +3414,6 @@ PHP_FUNCTION(pg_copy_to) PQclear(pgsql_result); PHP_PQ_ERROR("Copy command failed: %s", pgsql); RETURN_FALSE; - break; } } /* }}} */ @@ -3551,12 +3544,10 @@ PHP_FUNCTION(pg_copy_from) RETURN_FALSE; } RETURN_TRUE; - break; default: PQclear(pgsql_result); PHP_PQ_ERROR("Copy command failed: %s", pgsql); RETURN_FALSE; - break; } } /* }}} */ @@ -5793,7 +5784,6 @@ PHP_FUNCTION(pg_insert) PHP_PQ_ERROR("Query failed: %s", pg_link); PQclear(pg_result); RETURN_FALSE; - break; case PGRES_COMMAND_OK: /* successful command that did not return rows */ default: if (pg_result) { diff --git a/ext/session/session.c b/ext/session/session.c index 6cdd1c91eae..c04e19e25ed 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -1652,7 +1652,6 @@ PHPAPI zend_result php_session_start(void) case php_session_active: php_session_session_already_started_error(E_NOTICE, "Ignoring session_start() because a session has already been started"); return FAILURE; - break; case php_session_disabled: { const char *value = zend_ini_string(ZEND_STRL("session.save_handler"), false); diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c index 464bd87d5d3..4582de4bc8e 100644 --- a/ext/sockets/sockets.c +++ b/ext/sockets/sockets.c @@ -1033,7 +1033,6 @@ PHP_FUNCTION(socket_getsockname) ZEND_TRY_ASSIGN_REF_LONG(objint, htons(sin6->sin6_port)); } RETURN_TRUE; - break; #endif case AF_INET: sin = (struct sockaddr_in *) sa; @@ -1044,14 +1043,12 @@ PHP_FUNCTION(socket_getsockname) ZEND_TRY_ASSIGN_REF_LONG(objint, htons(sin->sin_port)); } RETURN_TRUE; - break; case AF_UNIX: s_un = (struct sockaddr_un *) sa; ZEND_TRY_ASSIGN_REF_STRING(addr, s_un->sun_path); RETURN_TRUE; - break; #ifdef AF_PACKET case AF_PACKET: sll = (struct sockaddr_ll *) sa; @@ -1067,7 +1064,6 @@ PHP_FUNCTION(socket_getsockname) ZEND_TRY_ASSIGN_REF_LONG(objint, sll->sll_ifindex); } RETURN_TRUE; - break; #endif default: @@ -1123,7 +1119,6 @@ PHP_FUNCTION(socket_getpeername) } RETURN_TRUE; - break; #endif case AF_INET: sin = (struct sockaddr_in *) sa; @@ -1135,14 +1130,12 @@ PHP_FUNCTION(socket_getpeername) } RETURN_TRUE; - break; case AF_UNIX: s_un = (struct sockaddr_un *) sa; ZEND_TRY_ASSIGN_REF_STRING(arg2, s_un->sun_path); RETURN_TRUE; - break; default: zend_argument_value_error(1, "must be one of AF_UNIX, AF_INET, or AF_INET6"); diff --git a/ext/sqlite3/sqlite3.c b/ext/sqlite3/sqlite3.c index 659de2291d8..27d8cd17fbd 100644 --- a/ext/sqlite3/sqlite3.c +++ b/ext/sqlite3/sqlite3.c @@ -2016,7 +2016,6 @@ PHP_METHOD(SQLite3Result, fetchArray) case SQLITE_DONE: RETURN_FALSE; - break; default: php_sqlite3_error(result_obj->db_obj, sqlite3_errcode(sqlite3_db_handle(result_obj->stmt_obj->stmt)), "Unable to execute statement: %s", sqlite3_errmsg(sqlite3_db_handle(result_obj->stmt_obj->stmt))); diff --git a/ext/standard/array.c b/ext/standard/array.c index 3ee5afa70f8..87118cbd0ff 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -620,7 +620,6 @@ PHP_FUNCTION(count) cnt = php_count_recursive(Z_ARRVAL_P(array)); } RETURN_LONG(cnt); - break; case IS_OBJECT: { zval retval; /* first, we check if the handler is defined */ diff --git a/ext/standard/file.c b/ext/standard/file.c index a7b73f1fe56..364985f786b 100644 --- a/ext/standard/file.c +++ b/ext/standard/file.c @@ -1450,7 +1450,6 @@ PHPAPI zend_result php_copy_file_ctx(const char *src, const char *dest, int src_ case -1: /* non-statable stream */ goto safe_to_copy; - break; case 0: break; default: /* failed to stat file, does not exist? */ @@ -1465,7 +1464,6 @@ PHPAPI zend_result php_copy_file_ctx(const char *src, const char *dest, int src_ case -1: /* non-statable stream */ goto safe_to_copy; - break; case 0: break; default: /* failed to stat file, does not exist? */ @@ -2148,18 +2146,14 @@ php_meta_tags_token php_next_meta_token(php_meta_tags_data *md) switch (ch) { case '<': return TOK_OPENTAG; - break; case '>': return TOK_CLOSETAG; - break; case '=': return TOK_EQUAL; - break; case '/': return TOK_SLASH; - break; case '\'': case '"': @@ -2186,7 +2180,6 @@ php_meta_tags_token php_next_meta_token(php_meta_tags_data *md) } return TOK_STRING; - break; case '\n': case '\r': @@ -2195,7 +2188,6 @@ php_meta_tags_token php_next_meta_token(php_meta_tags_data *md) case ' ': return TOK_SPACE; - break; default: if (isalnum(ch)) { diff --git a/ext/standard/filestat.c b/ext/standard/filestat.c index 85c2517ed91..01c392f3936 100644 --- a/ext/standard/filestat.c +++ b/ext/standard/filestat.c @@ -774,22 +774,18 @@ PHPAPI void php_stat(zend_string *filename, int type, zval *return_value) #ifdef F_OK case FS_EXISTS: RETURN_BOOL(VCWD_ACCESS(file_path_to_check, F_OK) == 0); - break; #endif #ifdef W_OK case FS_IS_W: RETURN_BOOL(VCWD_ACCESS(file_path_to_check, W_OK) == 0); - break; #endif #ifdef R_OK case FS_IS_R: RETURN_BOOL(VCWD_ACCESS(file_path_to_check, R_OK) == 0); - break; #endif #ifdef X_OK case FS_IS_X: RETURN_BOOL(VCWD_ACCESS(file_path_to_check, X_OK) == 0); - break; #endif } } diff --git a/ext/standard/math.c b/ext/standard/math.c index 6418a020f4f..a1d151209a7 100644 --- a/ext/standard/math.c +++ b/ext/standard/math.c @@ -1419,7 +1419,6 @@ PHP_FUNCTION(number_format) switch (Z_TYPE_P(num)) { case IS_LONG: RETURN_STR(_php_math_number_format_long(Z_LVAL_P(num), dec, dec_point, dec_point_len, thousand_sep, thousand_sep_len)); - break; case IS_DOUBLE: // double values of >= 2^52 can not have fractional digits anymore @@ -1429,7 +1428,6 @@ PHP_FUNCTION(number_format) && ZEND_DOUBLE_FITS_LONG(Z_DVAL_P(num)) )) { RETURN_STR(_php_math_number_format_long((zend_long)Z_DVAL_P(num), dec, dec_point, dec_point_len, thousand_sep, thousand_sep_len)); - break; } if (dec >= 0) { @@ -1438,7 +1436,6 @@ PHP_FUNCTION(number_format) dec_int = ZEND_LONG_INT_UDFL(dec) ? INT_MIN : (int)dec; } RETURN_STR(_php_math_number_format_ex(Z_DVAL_P(num), dec_int, dec_point, dec_point_len, thousand_sep, thousand_sep_len)); - break; EMPTY_SWITCH_DEFAULT_CASE() } diff --git a/ext/standard/type.c b/ext/standard/type.c index 5bb7b3b803e..a228e899046 100644 --- a/ext/standard/type.c +++ b/ext/standard/type.c @@ -350,7 +350,6 @@ static zend_always_inline void _zend_is_numeric(zval *return_value, zval *arg) case IS_LONG: case IS_DOUBLE: RETURN_TRUE; - break; case IS_STRING: if (is_numeric_string(Z_STRVAL_P(arg), Z_STRLEN_P(arg), NULL, NULL, 0)) { @@ -362,7 +361,6 @@ static zend_always_inline void _zend_is_numeric(zval *return_value, zval *arg) default: RETURN_FALSE; - break; } } @@ -404,11 +402,9 @@ PHP_FUNCTION(is_scalar) case IS_LONG: case IS_STRING: RETURN_TRUE; - break; default: RETURN_FALSE; - break; } } /* }}} */ diff --git a/ext/standard/var.c b/ext/standard/var.c index 8d4c5926372..e0184d9af71 100644 --- a/ext/standard/var.c +++ b/ext/standard/var.c @@ -228,7 +228,6 @@ again: } struc = Z_REFVAL_P(struc); goto again; - break; default: php_printf("%sUNKNOWN:0\n", COMMON); break; @@ -674,7 +673,6 @@ again: case IS_REFERENCE: struc = Z_REFVAL_P(struc); goto again; - break; default: smart_str_appendl(buf, "NULL", 4); break; diff --git a/ext/xml/xml.c b/ext/xml/xml.c index 7a9329bcc80..8b3733fd70a 100644 --- a/ext/xml/xml.c +++ b/ext/xml/xml.c @@ -1620,7 +1620,6 @@ PHP_FUNCTION(xml_parser_set_option) default: zend_argument_value_error(2, "must be a XML_OPTION_* constant"); RETURN_THROWS(); - break; } RETURN_TRUE; @@ -1642,19 +1641,14 @@ PHP_FUNCTION(xml_parser_get_option) switch (opt) { case PHP_XML_OPTION_CASE_FOLDING: RETURN_BOOL(parser->case_folding); - break; case PHP_XML_OPTION_SKIP_TAGSTART: RETURN_LONG(parser->toffset); - break; case PHP_XML_OPTION_SKIP_WHITE: RETURN_BOOL(parser->skipwhite); - break; case PHP_XML_OPTION_PARSE_HUGE: RETURN_BOOL(parser->parsehuge); - break; case PHP_XML_OPTION_TARGET_ENCODING: RETURN_STRING((char *)parser->target_encoding); - break; default: zend_argument_value_error(2, "must be a XML_OPTION_* constant"); RETURN_THROWS(); diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index d5a89768ff6..ad2c9edb9dd 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -1239,13 +1239,11 @@ PHP_FUNCTION(deflate_add) ZSTR_LEN(out) = (char *) ctx->Z.next_out - ZSTR_VAL(out); ZSTR_VAL(out)[ZSTR_LEN(out)] = 0; RETURN_STR(out); - break; case Z_STREAM_END: ZSTR_LEN(out) = (char *) ctx->Z.next_out - ZSTR_VAL(out); ZSTR_VAL(out)[ZSTR_LEN(out)] = 0; deflateReset(&ctx->Z); RETURN_STR(out); - break; default: zend_string_release_ex(out, 0); php_error_docref(NULL, E_WARNING, "zlib error (%s)", zError(status));