Skip to content

Commit 770ce9b

Browse files
committed
Rename php_odbc_fetch_hash to remove _hash
Since this is a much more shared fetch function now.
1 parent 99bb325 commit 770ce9b

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

ext/odbc/php_odbc.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1312,8 +1312,8 @@ typedef enum php_odbc_fetch_result_type_t {
13121312
ODBC_OBJECT = 2,
13131313
} php_odbc_fetch_result_type_t;
13141314

1315-
/* {{{ php_odbc_fetch_hash */
1316-
static void php_odbc_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, bool return_array, php_odbc_fetch_result_type_t result_type)
1315+
/* {{{ php_odbc_fetch */
1316+
static void php_odbc_fetch(INTERNAL_FUNCTION_PARAMETERS, bool return_array, php_odbc_fetch_result_type_t result_type)
13171317
{
13181318
int i;
13191319
odbc_result *result;
@@ -1493,7 +1493,7 @@ static void php_odbc_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, bool return_array,
14931493
/* {{{ Fetch a result row as an object */
14941494
PHP_FUNCTION(odbc_fetch_object)
14951495
{
1496-
php_odbc_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, true, ODBC_OBJECT);
1496+
php_odbc_fetch(INTERNAL_FUNCTION_PARAM_PASSTHRU, true, ODBC_OBJECT);
14971497
if (Z_TYPE_P(return_value) == IS_ARRAY) {
14981498
object_and_properties_init(return_value, ZEND_STANDARD_CLASS_DEF_PTR, Z_ARRVAL_P(return_value));
14991499
}
@@ -1503,21 +1503,21 @@ PHP_FUNCTION(odbc_fetch_object)
15031503
/* {{{ Fetch a result row as an associative array */
15041504
PHP_FUNCTION(odbc_fetch_array)
15051505
{
1506-
php_odbc_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, true, ODBC_OBJECT);
1506+
php_odbc_fetch(INTERNAL_FUNCTION_PARAM_PASSTHRU, true, ODBC_OBJECT);
15071507
}
15081508
/* }}} */
15091509

15101510
/* {{{ Fetch one result row into an array */
15111511
PHP_FUNCTION(odbc_fetch_into)
15121512
{
1513-
php_odbc_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, false, ODBC_NUM);
1513+
php_odbc_fetch(INTERNAL_FUNCTION_PARAM_PASSTHRU, false, ODBC_NUM);
15141514
}
15151515
/* }}} */
15161516

15171517
/* {{{ Fetch a row */
15181518
PHP_FUNCTION(odbc_fetch_row)
15191519
{
1520-
php_odbc_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, false, ODBC_NONE);
1520+
php_odbc_fetch(INTERNAL_FUNCTION_PARAM_PASSTHRU, false, ODBC_NONE);
15211521
}
15221522
/* }}} */
15231523

0 commit comments

Comments
 (0)