Skip to content

Commit 63c4e8b

Browse files
committed
Voidify internal pdo_sqlstate_init_error_table()
This always returned SUCCESS
1 parent 0807c6c commit 63c4e8b

File tree

3 files changed

+3
-7
lines changed

3 files changed

+3
-7
lines changed

ext/pdo/pdo.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -284,9 +284,7 @@ PDO_API zend_string *php_pdo_int64_to_str(int64_t i64) /* {{{ */
284284
/* {{{ PHP_MINIT_FUNCTION */
285285
PHP_MINIT_FUNCTION(pdo)
286286
{
287-
if (FAILURE == pdo_sqlstate_init_error_table()) {
288-
return FAILURE;
289-
}
287+
pdo_sqlstate_init_error_table();
290288

291289
zend_hash_init(&pdo_driver_hash, 0, NULL, NULL, 1);
292290

ext/pdo/pdo_sqlstate.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ void pdo_sqlstate_fini_error_table(void)
305305
zend_hash_destroy(&err_hash);
306306
}
307307

308-
int pdo_sqlstate_init_error_table(void)
308+
void pdo_sqlstate_init_error_table(void)
309309
{
310310
size_t i;
311311
const struct pdo_sqlstate_info *info;
@@ -317,8 +317,6 @@ int pdo_sqlstate_init_error_table(void)
317317

318318
zend_hash_str_add_ptr(&err_hash, info->state, sizeof(info->state), (void *)info);
319319
}
320-
321-
return SUCCESS;
322320
}
323321

324322
const char *pdo_sqlstate_state_to_description(char *state)

ext/pdo/php_pdo_int.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ zend_object_iterator *php_pdo_dbstmt_iter_get(zend_class_entry *ce, zval *object
5353

5454
extern pdo_driver_t *pdo_find_driver(const char *name, int namelen);
5555

56-
int pdo_sqlstate_init_error_table(void);
56+
void pdo_sqlstate_init_error_table(void);
5757
void pdo_sqlstate_fini_error_table(void);
5858
const char *pdo_sqlstate_state_to_description(char *state);
5959
int pdo_hash_methods(pdo_dbh_object_t *dbh, int kind);

0 commit comments

Comments
 (0)