Voidify internal pdo_sqlstate_init_error_table()

This always returned SUCCESS

diff --git a/ext/pdo/pdo.c b/ext/pdo/pdo.c
index 89c4415c64155d4df19e362fcf1cfc54bc5faeb3..1120f9a3269a88091d8d6857adeac8ffef4732c2 100644 (file)
--- 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 7df2f9c87a3a30615db531bcbfeeda69112d7cd3..00a5adeb6dc2cc45e63cdc5726629dce9ca9a467 100644 (file)
--- 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 7f992a5fd0de2aebe54177662cf77d2ca16d9925..1e8dcccb9ed17a4c7ae29f85cb1e8eb65ddd75c4 100644 (file)
--- 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);