From: George Peter Banyard Date: Fri, 12 Mar 2021 02:57:46 +0000 (+0000) Subject: Voidify internal pdo_sqlstate_init_error_table() X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=63c4e8b5ab0cb47eaf167e38fa1e2dd0d3a7a330;p=php Voidify internal pdo_sqlstate_init_error_table() This always returned SUCCESS --- diff --git a/ext/pdo/pdo.c b/ext/pdo/pdo.c index 89c4415c64..1120f9a326 100644 --- a/ext/pdo/pdo.c +++ b/ext/pdo/pdo.c @@ -284,9 +284,7 @@ PDO_API zend_string *php_pdo_int64_to_str(int64_t i64) /* {{{ */ /* {{{ PHP_MINIT_FUNCTION */ PHP_MINIT_FUNCTION(pdo) { - if (FAILURE == pdo_sqlstate_init_error_table()) { - return FAILURE; - } + pdo_sqlstate_init_error_table(); zend_hash_init(&pdo_driver_hash, 0, NULL, NULL, 1); diff --git a/ext/pdo/pdo_sqlstate.c b/ext/pdo/pdo_sqlstate.c index 7df2f9c87a..00a5adeb6d 100644 --- a/ext/pdo/pdo_sqlstate.c +++ b/ext/pdo/pdo_sqlstate.c @@ -305,7 +305,7 @@ void pdo_sqlstate_fini_error_table(void) zend_hash_destroy(&err_hash); } -int pdo_sqlstate_init_error_table(void) +void pdo_sqlstate_init_error_table(void) { size_t i; const struct pdo_sqlstate_info *info; @@ -317,8 +317,6 @@ int pdo_sqlstate_init_error_table(void) zend_hash_str_add_ptr(&err_hash, info->state, sizeof(info->state), (void *)info); } - - return SUCCESS; } const char *pdo_sqlstate_state_to_description(char *state) diff --git a/ext/pdo/php_pdo_int.h b/ext/pdo/php_pdo_int.h index 7f992a5fd0..1e8dcccb9e 100644 --- a/ext/pdo/php_pdo_int.h +++ b/ext/pdo/php_pdo_int.h @@ -53,7 +53,7 @@ zend_object_iterator *php_pdo_dbstmt_iter_get(zend_class_entry *ce, zval *object extern pdo_driver_t *pdo_find_driver(const char *name, int namelen); -int pdo_sqlstate_init_error_table(void); +void pdo_sqlstate_init_error_table(void); void pdo_sqlstate_fini_error_table(void); const char *pdo_sqlstate_state_to_description(char *state); int pdo_hash_methods(pdo_dbh_object_t *dbh, int kind);