diff options
Diffstat (limited to 'ext/dba/dba.c')
| -rw-r--r-- | ext/dba/dba.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ext/dba/dba.c b/ext/dba/dba.c index 7e8ef11b03..f0f1beed75 100644 --- a/ext/dba/dba.c +++ b/ext/dba/dba.c @@ -114,8 +114,8 @@ static size_t php_dba_make_key(zval *key, char **key_str, char **key_free) group = zend_hash_get_current_data_ex(Z_ARRVAL_P(key), &pos); zend_hash_move_forward_ex(Z_ARRVAL_P(key), &pos); name = zend_hash_get_current_data_ex(Z_ARRVAL_P(key), &pos); - convert_to_string_ex(group); - convert_to_string_ex(name); + convert_to_string(group); + convert_to_string(name); if (Z_STRLEN_P(group) == 0) { *key_str = Z_STRVAL_P(name); *key_free = NULL; @@ -542,8 +542,8 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, int persistent) zend_string *opened_path = NULL; char *lock_name; #ifdef PHP_WIN32 - zend_bool restarted = 0; - zend_bool need_creation = 0; + bool restarted = 0; + bool need_creation = 0; #endif if (ac < 2) { @@ -860,7 +860,7 @@ restart: fcntl(info->fd, F_SETFL, flags & ~O_APPEND); #elif defined(PHP_WIN32) } else if (modenr == DBA_CREAT && need_creation && !restarted) { - zend_bool close_both; + bool close_both; close_both = (info->fp != info->lock.fp); php_stream_free(info->lock.fp, persistent ? PHP_STREAM_FREE_CLOSE_PERSISTENT : PHP_STREAM_FREE_CLOSE); @@ -1155,7 +1155,7 @@ PHP_FUNCTION(dba_sync) PHP_FUNCTION(dba_handlers) { dba_handler *hptr; - zend_bool full_info = 0; + bool full_info = 0; if (zend_parse_parameters(ZEND_NUM_ARGS(), "|b", &full_info) == FAILURE) { RETURN_THROWS(); |