diff options
Diffstat (limited to 'ext/pgsql/pgsql.c')
| -rw-r--r-- | ext/pgsql/pgsql.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c index 4685c7cd74..821af14efa 100644 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@ -1547,7 +1547,7 @@ PHP_FUNCTION(pg_field_table) zval *result; pgsql_result_handle *pg_result; zend_long fnum = -1; - zend_bool return_oid = 0; + bool return_oid = 0; Oid oid; smart_str hash_key = {0}; char *table_name; @@ -2614,7 +2614,7 @@ PHP_FUNCTION(pg_lo_write) zval *pgsql_id; char *str; zend_long z_len; - zend_bool z_len_is_null = 1; + bool z_len_is_null = 1; size_t str_len, nbytes; size_t len; pgLofp *pgsql; @@ -3613,7 +3613,7 @@ static void php_pgsql_do_async(INTERNAL_FUNCTION_PARAMETERS, int entry_type) if (PQsetnonblocking(pgsql, 0)) { php_error_docref(NULL, E_NOTICE, "Cannot set connection to blocking mode"); } - convert_to_boolean_ex(return_value); + convert_to_boolean(return_value); } /* }}} */ @@ -4240,7 +4240,7 @@ PHP_FUNCTION(pg_flush) * table_name must not be empty * TODO: Add meta_data cache for better performance */ -PHP_PGSQL_API int php_pgsql_meta_data(PGconn *pg_link, const char *table_name, zval *meta, zend_bool extended) +PHP_PGSQL_API int php_pgsql_meta_data(PGconn *pg_link, const char *table_name, zval *meta, bool extended) { PGresult *pg_result; char *src, *tmp_name, *tmp_name2 = NULL; @@ -4355,7 +4355,7 @@ PHP_FUNCTION(pg_meta_data) zval *pgsql_link; char *table_name; size_t table_name_len; - zend_bool extended=0; + bool extended=0; PGconn *pgsql; if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs|b", @@ -4527,7 +4527,7 @@ static int php_pgsql_convert_match(const char *str, size_t str_len, const char * /* {{{ php_pgsql_add_quote * add quotes around string. */ -static int php_pgsql_add_quotes(zval *src, zend_bool should_free) +static int php_pgsql_add_quotes(zval *src, bool should_free) { smart_str str = {0}; @@ -4721,7 +4721,7 @@ PHP_PGSQL_API int php_pgsql_convert(PGconn *pg_link, const char *table_name, con case IS_DOUBLE: ZVAL_DOUBLE(&new_val, Z_DVAL_P(val)); - convert_to_long_ex(&new_val); + convert_to_long(&new_val); break; case IS_LONG: @@ -4837,7 +4837,7 @@ PHP_PGSQL_API int php_pgsql_convert(PGconn *pg_link, const char *table_name, con case IS_DOUBLE: ZVAL_DOUBLE(&new_val, Z_DVAL_P(val)); - convert_to_string_ex(&new_val); + convert_to_string(&new_val); break; case IS_NULL: @@ -4868,14 +4868,14 @@ PHP_PGSQL_API int php_pgsql_convert(PGconn *pg_link, const char *table_name, con } else { ZVAL_STRINGL(&new_val, Z_STRVAL_P(val), Z_STRLEN_P(val)); - convert_to_long_ex(&new_val); + convert_to_long(&new_val); } } break; case IS_DOUBLE: ZVAL_DOUBLE(&new_val, Z_DVAL_P(val)); - convert_to_long_ex(&new_val); + convert_to_long(&new_val); break; case IS_LONG: @@ -5140,7 +5140,7 @@ PHP_PGSQL_API int php_pgsql_convert(PGconn *pg_link, const char *table_name, con case IS_DOUBLE: ZVAL_DOUBLE(&new_val, Z_DVAL_P(val)); - convert_to_string_ex(&new_val); + convert_to_string(&new_val); break; case IS_NULL: |