From: George Peter Banyard Date: Fri, 12 Mar 2021 03:11:31 +0000 (+0000) Subject: Boolify pdo_hash_methods() X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3e6940fe2954a8ba1c6d535c67ae3a4eec333d2a;p=php Boolify pdo_hash_methods() --- diff --git a/ext/pdo/pdo_dbh.c b/ext/pdo/pdo_dbh.c index 55dac17434..4c75e56be2 100644 --- a/ext/pdo/pdo_dbh.c +++ b/ext/pdo/pdo_dbh.c @@ -1173,7 +1173,7 @@ static void cls_method_pdtor(zval *el) /* {{{ */ { /* }}} */ /* {{{ overloaded object handlers for PDO class */ -int pdo_hash_methods(pdo_dbh_object_t *dbh_obj, int kind) +bool pdo_hash_methods(pdo_dbh_object_t *dbh_obj, int kind) { const zend_function_entry *funcs; zend_internal_function func; @@ -1182,11 +1182,11 @@ int pdo_hash_methods(pdo_dbh_object_t *dbh_obj, int kind) pdo_dbh_t *dbh = dbh_obj->inner; if (!dbh || !dbh->methods || !dbh->methods->get_driver_methods) { - return 0; + return false; } funcs = dbh->methods->get_driver_methods(dbh, kind); if (!funcs) { - return 0; + return false; } dbh->cls_methods[kind] = pemalloc(sizeof(HashTable), dbh->is_persistent); @@ -1238,7 +1238,7 @@ int pdo_hash_methods(pdo_dbh_object_t *dbh_obj, int kind) funcs++; } - return 1; + return true; } static zend_function *dbh_method_get(zend_object **object, zend_string *method_name, const zval *key) diff --git a/ext/pdo/php_pdo_int.h b/ext/pdo/php_pdo_int.h index 4027721200..59ad4b8dd4 100644 --- a/ext/pdo/php_pdo_int.h +++ b/ext/pdo/php_pdo_int.h @@ -56,4 +56,4 @@ extern pdo_driver_t *pdo_find_driver(const char *name, int namelen); 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); +bool pdo_hash_methods(pdo_dbh_object_t *dbh, int kind);