archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 22:18:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Restoring old parameter ordering in odbc_fetch_into()

Browse source
This commit is contained in:
Andreas Karajannis 2000-05-11 16:24:03 +00:00
parent c88ccc49a1
commit 010f7850e0
1 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
ext/odbc/php_odbc.c
View file

@ -67,7 +67,7 @@ static int le_result, le_conn, le_pconn;
#define SAFE_SQL_NTS(n) ((SWORD) ((n)?(SQL_NTS):0)) #define SAFE_SQL_NTS(n) ((SWORD) ((n)?(SQL_NTS):0))
static unsigned char a3_arg2_force_ref[] = { 3, BYREF_NONE, BYREF_FORCE, BYREF_NONE }; static unsigned char a3_arg3_force_ref[] = { 3, BYREF_NONE, BYREF_ALLOW, BYREF_FORCE };
function_entry odbc_functions[] = { function_entry odbc_functions[] = {
PHP_FE(odbc_setoption, NULL) PHP_FE(odbc_setoption, NULL)
@ -82,7 +82,7 @@ function_entry odbc_functions[] = {
PHP_FE(odbc_prepare, NULL) PHP_FE(odbc_prepare, NULL)
PHP_FE(odbc_execute, NULL) PHP_FE(odbc_execute, NULL)
PHP_FE(odbc_fetch_row, NULL) PHP_FE(odbc_fetch_row, NULL)
PHP_FE(odbc_fetch_into, a3_arg2_force_ref) PHP_FE(odbc_fetch_into, a3_arg3_force_ref)
PHP_FE(odbc_field_len, NULL) PHP_FE(odbc_field_len, NULL)
PHP_FE(odbc_field_scale, NULL) PHP_FE(odbc_field_scale, NULL)
PHP_FE(odbc_field_name, NULL) PHP_FE(odbc_field_name, NULL)
@ -1113,7 +1113,7 @@ PHP_FUNCTION(odbc_fetch_into)
WRONG_PARAM_COUNT; WRONG_PARAM_COUNT;
break; break;
case 3: case 3:
if (zend_get_parameters_ex(3, &pv_res, &pv_res_arr, &pv_row) == FAILURE) if (zend_get_parameters_ex(3, &pv_res, &pv_row, &pv_res_arr) == FAILURE)
WRONG_PARAM_COUNT; WRONG_PARAM_COUNT;
convert_to_long_ex(pv_row); convert_to_long_ex(pv_row);
rownum = (*pv_row)->value.lval; rownum = (*pv_row)->value.lval;
@ -1122,10 +1122,6 @@ PHP_FUNCTION(odbc_fetch_into)
WRONG_PARAM_COUNT; WRONG_PARAM_COUNT;
} }
if (!ParameterPassedByReference(ht, 2)) {
php_error(E_WARNING, "Array not passed by reference in call to odbc_fetch_into()");
RETURN_FALSE;
}
#else #else
pval **pv_res, **pv_res_arr, *tmp; pval **pv_res, **pv_res_arr, *tmp;
@ -1134,12 +1130,12 @@ PHP_FUNCTION(odbc_fetch_into)
if (numArgs != 2 || zend_get_parameters_ex(2, &pv_res, &pv_res_arr) == FAILURE) { if (numArgs != 2 || zend_get_parameters_ex(2, &pv_res, &pv_res_arr) == FAILURE) {
WRONG_PARAM_COUNT; WRONG_PARAM_COUNT;
} }
#endif
if (!ParameterPassedByReference(ht, numArgs)) { if (!ParameterPassedByReference(ht, numArgs)) {
php_error(E_WARNING, "Array not passed by reference in call to odbc_fetch_into()"); php_error(E_WARNING, "Array not passed by reference in call to odbc_fetch_into()");
RETURN_FALSE; RETURN_FALSE;
} }
#endif
ZEND_FETCH_RESOURCE(result, odbc_result *, pv_res, -1, "ODBC result", le_result); ZEND_FETCH_RESOURCE(result, odbc_result *, pv_res, -1, "ODBC result", le_result);