summaryrefslogtreecommitdiff
path: root/ext/odbc
diff options
context:
space:
mode:
Diffstat (limited to 'ext/odbc')
-rw-r--r--ext/odbc/php_odbc.c40
-rw-r--r--ext/odbc/velocis.c24
2 files changed, 32 insertions, 32 deletions
diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index f4823878e2..7a2260ae0c 100644
--- a/ext/odbc/php_odbc.c
+++ b/ext/odbc/php_odbc.c
@@ -781,7 +781,7 @@ PHP_FUNCTION(odbc_execute)
int numArgs, i, ne;
RETCODE rc;
- numArgs = ARG_COUNT(ht);
+ numArgs = ZEND_NUM_ARGS();
if (numArgs == 1) {
if (zend_get_parameters_ex(1, &pv_res) == FAILURE)
WRONG_PARAM_COUNT;
@@ -1003,7 +1003,7 @@ PHP_FUNCTION(odbc_exec)
UDWORD scrollopts;
#endif
- numArgs = ARG_COUNT(ht);
+ numArgs = ZEND_NUM_ARGS();
if (numArgs > 2) {
if (zend_get_parameters_ex(3, &pv_conn, &pv_query, &pv_flags) == FAILURE)
WRONG_PARAM_COUNT;
@@ -1105,7 +1105,7 @@ PHP_FUNCTION(odbc_fetch_into)
SDWORD rownum = -1;
pval **pv_res, **pv_row, **pv_res_arr, *tmp;
- numArgs = ARG_COUNT(ht);
+ numArgs = ZEND_NUM_ARGS();
switch(numArgs) {
case 2:
@@ -1125,7 +1125,7 @@ PHP_FUNCTION(odbc_fetch_into)
#else
pval **pv_res, **pv_res_arr, *tmp;
- numArgs = ARG_COUNT(ht);
+ numArgs = ZEND_NUM_ARGS();
if (numArgs != 2 || zend_get_parameters_ex(2, &pv_res, &pv_res_arr) == FAILURE) {
WRONG_PARAM_COUNT;
@@ -1271,7 +1271,7 @@ PHP_FUNCTION(odbc_fetch_row)
UWORD RowStatus[1];
#endif
- numArgs = ARG_COUNT(ht);
+ numArgs = ZEND_NUM_ARGS();
if (numArgs == 1) {
if (zend_get_parameters_ex(1, &pv_res) == FAILURE)
WRONG_PARAM_COUNT;
@@ -1333,7 +1333,7 @@ PHP_FUNCTION(odbc_result)
field_ind = -1;
field = NULL;
- if (ARG_COUNT(ht) != 2 || zend_get_parameters_ex(2 , &pv_res, &pv_field) == FAILURE) {
+ if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2 , &pv_res, &pv_field) == FAILURE) {
WRONG_PARAM_COUNT;
}
@@ -1499,7 +1499,7 @@ PHP_FUNCTION(odbc_result_all)
UWORD RowStatus[1];
#endif
- numArgs = ARG_COUNT(ht);
+ numArgs = ZEND_NUM_ARGS();
if (numArgs == 1) {
if (zend_get_parameters_ex(1, &pv_res) == FAILURE)
WRONG_PARAM_COUNT;
@@ -1741,7 +1741,7 @@ void odbc_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
/* Now an optional 4th parameter specifying the cursor type
* defaulting to the cursors default
*/
- switch(ARG_COUNT(ht)) {
+ switch(ZEND_NUM_ARGS()) {
case 3:
if (zend_get_parameters_ex(3, &pv_db, &pv_uid, &pv_pwd) == FAILURE) {
WRONG_PARAM_COUNT;
@@ -2123,7 +2123,7 @@ PHP_FUNCTION(odbc_autocommit)
pval **pv_conn, **pv_onoff = NULL;
int argc;
- argc = ARG_COUNT(ht);
+ argc = ZEND_NUM_ARGS();
if (argc == 2) {
if (zend_get_parameters_ex(2, &pv_conn, &pv_onoff) == FAILURE) {
WRONG_PARAM_COUNT;
@@ -2253,7 +2253,7 @@ PHP_FUNCTION(odbc_tables)
RETCODE rc;
int argc;
- argc = ARG_COUNT(ht);
+ argc = ZEND_NUM_ARGS();
if (argc == 1) {
if (zend_get_parameters_ex(1, &pv_conn) == FAILURE) {
WRONG_PARAM_COUNT;
@@ -2335,7 +2335,7 @@ PHP_FUNCTION(odbc_columns)
RETCODE rc;
int argc;
- argc = ARG_COUNT(ht);
+ argc = ZEND_NUM_ARGS();
if (argc == 1) {
if (zend_get_parameters_ex(1, &pv_conn) == FAILURE) {
WRONG_PARAM_COUNT;
@@ -2418,7 +2418,7 @@ PHP_FUNCTION(odbc_columnprivileges)
RETCODE rc;
int argc;
- argc = ARG_COUNT(ht);
+ argc = ZEND_NUM_ARGS();
if (argc == 5) {
if (zend_get_parameters_ex(5, &pv_conn, &pv_cat, &pv_schema, &pv_table, &pv_column) == FAILURE) {
WRONG_PARAM_COUNT;
@@ -2500,7 +2500,7 @@ PHP_FUNCTION(odbc_foreignkeys)
RETCODE rc;
int argc;
- argc = ARG_COUNT(ht);
+ argc = ZEND_NUM_ARGS();
if (argc == 7) {
if (zend_get_parameters_ex(7, &pv_conn, &pv_pcat, &pv_pschema, &pv_ptable,
&pv_fcat, &pv_fschema, &pv_ftable) == FAILURE) {
@@ -2597,7 +2597,7 @@ PHP_FUNCTION(odbc_gettypeinfo)
int argc;
SWORD data_type = SQL_ALL_TYPES;
- argc = ARG_COUNT(ht);
+ argc = ZEND_NUM_ARGS();
if (argc == 1) {
if (zend_get_parameters_ex(1, &pv_conn) == FAILURE) {
WRONG_PARAM_COUNT;
@@ -2669,7 +2669,7 @@ PHP_FUNCTION(odbc_primarykeys)
RETCODE rc;
int argc;
- argc = ARG_COUNT(ht);
+ argc = ZEND_NUM_ARGS();
if (argc == 4) {
if (zend_get_parameters_ex(4, &pv_conn, &pv_cat, &pv_schema, &pv_table) == FAILURE) {
WRONG_PARAM_COUNT;
@@ -2745,7 +2745,7 @@ PHP_FUNCTION(odbc_procedurecolumns)
RETCODE rc;
int argc;
- argc = ARG_COUNT(ht);
+ argc = ZEND_NUM_ARGS();
if (argc == 1) {
if (zend_get_parameters_ex(1, &pv_conn) == FAILURE) {
WRONG_PARAM_COUNT;
@@ -2829,7 +2829,7 @@ PHP_FUNCTION(odbc_procedures)
RETCODE rc;
int argc;
- argc = ARG_COUNT(ht);
+ argc = ZEND_NUM_ARGS();
if (argc == 1) {
if (zend_get_parameters_ex(1, &pv_conn) == FAILURE) {
WRONG_PARAM_COUNT;
@@ -2912,7 +2912,7 @@ PHP_FUNCTION(odbc_specialcolumns)
RETCODE rc;
int argc;
- argc = ARG_COUNT(ht);
+ argc = ZEND_NUM_ARGS();
if (argc == 7) {
if (zend_get_parameters_ex(7, &pv_conn, &pv_type, &pv_cat, &pv_schema,
&pv_name, &pv_scope, &pv_nullable) == FAILURE) {
@@ -2999,7 +2999,7 @@ PHP_FUNCTION(odbc_statistics)
RETCODE rc;
int argc;
- argc = ARG_COUNT(ht);
+ argc = ZEND_NUM_ARGS();
if (argc == 6) {
if (zend_get_parameters_ex(6, &pv_conn, &pv_cat, &pv_schema,
&pv_name, &pv_unique, &pv_reserved) == FAILURE) {
@@ -3082,7 +3082,7 @@ PHP_FUNCTION(odbc_tableprivileges)
RETCODE rc;
int argc;
- argc = ARG_COUNT(ht);
+ argc = ZEND_NUM_ARGS();
if (argc == 4) {
if (zend_get_parameters_ex(4, &pv_conn, &pv_cat, &pv_schema, &pv_table) == FAILURE) {
WRONG_PARAM_COUNT;
diff --git a/ext/odbc/velocis.c b/ext/odbc/velocis.c
index 6c67a524e5..03c46d3e33 100644
--- a/ext/odbc/velocis.c
+++ b/ext/odbc/velocis.c
@@ -208,7 +208,7 @@ PHP_FUNCTION(velocis_connect)
php_error(E_WARNING,"Velocis: Too many open connections (%d)",php_velocis_module.num_links);
RETURN_FALSE;
}
- if ( ARG_COUNT(ht) != 3 ||
+ if ( ZEND_NUM_ARGS() != 3 ||
getParameters(ht,3,&serv,&user,&pass) == FAILURE ) {
WRONG_PARAM_COUNT;
}
@@ -245,7 +245,7 @@ PHP_FUNCTION(velocis_close)
pval *id;
VConn *conn;
- if ( ARG_COUNT(ht) != 1 || getParameters(ht,1,&id) == FAILURE ) {
+ if ( ZEND_NUM_ARGS() != 1 || getParameters(ht,1,&id) == FAILURE ) {
WRONG_PARAM_COUNT;
}
convert_to_long(id);
@@ -272,7 +272,7 @@ PHP_FUNCTION(velocis_exec)
SWORD cols,i,colnamelen;
SDWORD rows,coldesc;
- if ( ARG_COUNT(ht) != 2 || getParameters(ht,2,&ind,&exec_str) == FAILURE ) {
+ if ( ZEND_NUM_ARGS() != 2 || getParameters(ht,2,&ind,&exec_str) == FAILURE ) {
WRONG_PARAM_COUNT;
}
convert_to_long(ind);
@@ -367,7 +367,7 @@ PHP_FUNCTION(velocis_fetch)
UDWORD row;
UWORD RowStat[1];
- if ( ARG_COUNT(ht) != 1 || getParameters(ht,1,&ind) == FAILURE ) {
+ if ( ZEND_NUM_ARGS() != 1 || getParameters(ht,1,&ind) == FAILURE ) {
WRONG_PARAM_COUNT;
}
convert_to_long(ind);
@@ -403,7 +403,7 @@ PHP_FUNCTION(velocis_result)
SWORD indx = -1;
char *field = NULL;
- if ( ARG_COUNT(ht) != 2 || getParameters(ht,2,&ind,&col) == FAILURE ) {
+ if ( ZEND_NUM_ARGS() != 2 || getParameters(ht,2,&ind,&col) == FAILURE ) {
WRONG_PARAM_COUNT;
}
convert_to_long(ind);
@@ -494,7 +494,7 @@ PHP_FUNCTION(velocis_freeresult)
pval *ind;
Vresult *res;
- if ( ARG_COUNT(ht) != 1 || getParameters(ht,1,&ind) == FAILURE ) {
+ if ( ZEND_NUM_ARGS() != 1 || getParameters(ht,1,&ind) == FAILURE ) {
WRONG_PARAM_COUNT;
}
convert_to_long(ind);
@@ -514,7 +514,7 @@ PHP_FUNCTION(velocis_autocommit)
RETCODE stat;
VConn *conn;
- if ( ARG_COUNT(ht) != 1 || getParameters(ht,1,&id) == FAILURE ) {
+ if ( ZEND_NUM_ARGS() != 1 || getParameters(ht,1,&id) == FAILURE ) {
WRONG_PARAM_COUNT;
}
convert_to_long(id);
@@ -537,7 +537,7 @@ PHP_FUNCTION(velocis_off_autocommit)
RETCODE stat;
VConn *conn;
- if ( ARG_COUNT(ht) != 1 || getParameters(ht,1,&id) == FAILURE ) {
+ if ( ZEND_NUM_ARGS() != 1 || getParameters(ht,1,&id) == FAILURE ) {
WRONG_PARAM_COUNT;
}
convert_to_long(id);
@@ -560,7 +560,7 @@ PHP_FUNCTION(velocis_commit)
RETCODE stat;
VConn *conn;
- if ( ARG_COUNT(ht) != 1 || getParameters(ht,1,&id) == FAILURE ) {
+ if ( ZEND_NUM_ARGS() != 1 || getParameters(ht,1,&id) == FAILURE ) {
WRONG_PARAM_COUNT;
}
convert_to_long(id);
@@ -583,7 +583,7 @@ PHP_FUNCTION(velocis_rollback)
RETCODE stat;
VConn *conn;
- if ( ARG_COUNT(ht) != 1 || getParameters(ht,1,&id) == FAILURE ) {
+ if ( ZEND_NUM_ARGS() != 1 || getParameters(ht,1,&id) == FAILURE ) {
WRONG_PARAM_COUNT;
}
convert_to_long(id);
@@ -606,7 +606,7 @@ PHP_FUNCTION(velocis_fieldname)
Vresult *res;
SWORD indx;
- if ( ARG_COUNT(ht) != 2 || getParameters(ht,2,&ind,&col) == FAILURE ) {
+ if ( ZEND_NUM_ARGS() != 2 || getParameters(ht,2,&ind,&col) == FAILURE ) {
WRONG_PARAM_COUNT;
}
convert_to_long(ind);
@@ -629,7 +629,7 @@ PHP_FUNCTION(velocis_fieldnum)
pval *ind;
Vresult *res;
- if ( ARG_COUNT(ht) != 1 || getParameters(ht,1,&ind) == FAILURE ) {
+ if ( ZEND_NUM_ARGS() != 1 || getParameters(ht,1,&ind) == FAILURE ) {
WRONG_PARAM_COUNT;
}
convert_to_long(ind);
View Lorry Controller Status