diff options
| author | Andreas Karajannis <kara@php.net> | 2000-05-11 16:24:03 +0000 |
|---|---|---|
| committer | Andreas Karajannis <kara@php.net> | 2000-05-11 16:24:03 +0000 |
| commit | 010f7850e02bbf094df26754c34120a2938ebb6c (patch) | |
| tree | 322b4b57803770355689df15d9e887809971da34 | |
| parent | c88ccc49a1650e4ac4248b25dd152e5cc3a0010d (diff) | |
| download | php-git-010f7850e02bbf094df26754c34120a2938ebb6c.tar.gz | |
Restoring old parameter ordering in odbc_fetch_into()
| -rw-r--r-- | ext/odbc/php_odbc.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c index 331848da4e..34c0c6c71c 100644 --- a/ext/odbc/php_odbc.c +++ b/ext/odbc/php_odbc.c @@ -67,7 +67,7 @@ static int le_result, le_conn, le_pconn; #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[] = { PHP_FE(odbc_setoption, NULL) @@ -82,7 +82,7 @@ function_entry odbc_functions[] = { PHP_FE(odbc_prepare, NULL) PHP_FE(odbc_execute, 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_scale, NULL) PHP_FE(odbc_field_name, NULL) @@ -1113,7 +1113,7 @@ PHP_FUNCTION(odbc_fetch_into) WRONG_PARAM_COUNT; break; 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; convert_to_long_ex(pv_row); rownum = (*pv_row)->value.lval; @@ -1122,10 +1122,6 @@ PHP_FUNCTION(odbc_fetch_into) 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 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) { WRONG_PARAM_COUNT; } - +#endif + if (!ParameterPassedByReference(ht, numArgs)) { php_error(E_WARNING, "Array not passed by reference in call to odbc_fetch_into()"); RETURN_FALSE; } -#endif ZEND_FETCH_RESOURCE(result, odbc_result *, pv_res, -1, "ODBC result", le_result); |