cvs: php4 /ext/dbx dbx.c dbx.dsp dbx.h dbx_fbsql.c dbx_fbsql.h dbx_mssql.c dbx_mssql.h dbx_mysql.c dbx_mysql.h dbx_oci8.c dbx_oci8.h dbx_odbc.c
dbx_odbc.h dbx_pgsql.c dbx_pgsql.h howto_extend_dbx.html
| From: | Andi Gutmans | Date: | Fri, 17 Aug 2001 13:00:47 +0000 |
| Subject: | cvs: php4 /ext/dbx dbx.c dbx.dsp dbx.h dbx_fbsql.c dbx_fbsql.h dbx_mssql.c dbx_mssql.h dbx_mysql.c dbx_mysql.h dbx_oci8.c dbx_oci8.h dbx_odbc.c dbx_odbc.h dbx_pgsql.c dbx_pgsql.h howto_extend_dbx.html |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-6919@lists.php.net to get a copy of this message | ||
andi Fri Aug 17 09:00:47 2001 EDT
Modified files:
/php4/ext/dbx dbx.c dbx.dsp dbx.h dbx_fbsql.c dbx_fbsql.h
dbx_mssql.c dbx_mssql.h dbx_mysql.c dbx_mysql.h
dbx_oci8.c dbx_oci8.h dbx_odbc.c dbx_odbc.h
dbx_pgsql.c dbx_pgsql.h howto_extend_dbx.html
Log:
- Use the same coding standards for pointers as the rest of PHP.
- For example, char ** foo should be char **foo
Index: php4/ext/dbx/dbx.c diff -u php4/ext/dbx/dbx.c:1.23 php4/ext/dbx/dbx.c:1.24 --- php4/ext/dbx/dbx.c:1.23 Fri Aug 17 08:54:23 2001 +++ php4/ext/dbx/dbx.c Fri Aug 17 09:00:46 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dbx.c,v 1.23 2001/08/17 12:54:23 mboeren Exp $ */ +/* $Id: dbx.c,v 1.24 2001/08/17 13:00:46 andi Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -78,7 +78,7 @@ return DBX_UNKNOWN; } -int split_dbx_handle_object(zval ** dbx_object, zval *** pdbx_handle, zval *** pdbx_module, zval *** pdbx_database) { +int split_dbx_handle_object(zval **dbx_object, zval *** pdbx_handle, zval *** pdbx_module, zval *** pdbx_database) { convert_to_object_ex(dbx_object); if (zend_hash_find(Z_OBJPROP_PP(dbx_object), "handle", 7, (void **) pdbx_handle)==FAILURE || zend_hash_find(Z_OBJPROP_PP(dbx_object), "module", 7, (void **) pdbx_module)==FAILURE @@ -89,7 +89,7 @@ } /* from dbx.h, to be used in support-files (dbx_mysql.c etc...) */ -void dbx_call_any_function(INTERNAL_FUNCTION_PARAMETERS, char * function_name, zval ** returnvalue, int number_of_arguments, zval ***params) +void dbx_call_any_function(INTERNAL_FUNCTION_PARAMETERS, char * function_name, zval **returnvalue, int number_of_arguments, zval ***params) { zval * zval_function_name; @@ -110,23 +110,23 @@ * do NOT use the return_value parameter from INTERNAL_FUNCTION_PARAMETERS * you can additionally return 0 or 1 for failure or success which will also be returned by the switches */ -int switch_dbx_connect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS, zval ** dbx_module); +int switch_dbx_connect(zval **rv, zval **host, zval **db, zval **username, zval **password, INTERNAL_FUNCTION_PARAMETERS, zval **dbx_module); /* returns connection handle as resource on success or 0 as long on failure */ -int switch_dbx_pconnect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS, zval ** dbx_module); +int switch_dbx_pconnect(zval **rv, zval **host, zval **db, zval **username, zval **password, INTERNAL_FUNCTION_PARAMETERS, zval **dbx_module); /* returns persistent connection handle as resource on success or 0 as long on failure */ -int switch_dbx_close(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETERS, zval ** dbx_module); +int switch_dbx_close(zval **rv, zval **dbx_handle, INTERNAL_FUNCTION_PARAMETERS, zval **dbx_module); /* returns 1 as long on success or 0 as long on failure */ -int switch_dbx_query(zval ** rv, zval ** dbx_handle, zval ** db_name, zval ** sql_statement, INTERNAL_FUNCTION_PARAMETERS, zval ** dbx_module); +int switch_dbx_query(zval **rv, zval **dbx_handle, zval **db_name, zval **sql_statement, INTERNAL_FUNCTION_PARAMETERS, zval **dbx_module); /* returns 1 as long or result identifier as resource on success or 0 as long on failure */ -int switch_dbx_getcolumncount(zval ** rv, zval ** result_handle, INTERNAL_FUNCTION_PARAMETERS, zval ** dbx_module); +int switch_dbx_getcolumncount(zval **rv, zval **result_handle, INTERNAL_FUNCTION_PARAMETERS, zval **dbx_module); /* returns column-count as long on success or 0 as long on failure */ -int switch_dbx_getcolumnname(zval ** rv, zval ** result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS, zval ** dbx_module); +int switch_dbx_getcolumnname(zval **rv, zval **result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS, zval **dbx_module); /* returns column-name as string on success or 0 as long on failure */ -int switch_dbx_getcolumntype(zval ** rv, zval ** result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS, zval ** dbx_module); +int switch_dbx_getcolumntype(zval **rv, zval **result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS, zval **dbx_module); /* returns column-type as string on success or 0 as long on failure */ -int switch_dbx_getrow(zval ** rv, zval ** result_handle, long row_number, INTERNAL_FUNCTION_PARAMETERS, zval ** dbx_module); +int switch_dbx_getrow(zval **rv, zval **result_handle, long row_number, INTERNAL_FUNCTION_PARAMETERS, zval **dbx_module); /* returns array[0..columncount-1] as strings on success or 0 as long on failure */ -int switch_dbx_error(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETERS, zval ** dbx_module); +int switch_dbx_error(zval **rv, zval **dbx_handle, INTERNAL_FUNCTION_PARAMETERS, zval **dbx_module); /* returns string */ /* Every user visible function must have an entry in dbx_functions[]. @@ -219,7 +219,7 @@ ZEND_FUNCTION(dbx_connect) { int number_of_arguments=5; - zval ** arguments[6]; + zval **arguments[6]; int result; long module_identifier; @@ -301,12 +301,12 @@ ZEND_FUNCTION(dbx_close) { int number_of_arguments=1; - zval ** arguments[1]; + zval **arguments[1]; int result; - zval ** dbx_handle; - zval ** dbx_module; - zval ** dbx_database; + zval **dbx_handle; + zval **dbx_module; + zval **dbx_database; zval * rv_success; if (ZEND_NUM_ARGS() !=number_of_arguments || zend_get_parameters_array_ex(number_of_arguments, arguments) == FAILURE) { @@ -338,12 +338,12 @@ { int min_number_of_arguments=2; int number_of_arguments=3; - zval ** arguments[3]; + zval **arguments[3]; int result; - zval ** dbx_handle; - zval ** dbx_module; - zval ** dbx_database; + zval **dbx_handle; + zval **dbx_module; + zval **dbx_database; zval * rv_result_handle; zval * rv_column_count; long col_index; @@ -351,8 +351,8 @@ zval * info; long info_flags; zval * data; - zval ** row_ptr; - zval ** inforow_ptr; + zval **row_ptr; + zval **inforow_ptr; if (ZEND_NUM_ARGS()<min_number_of_arguments || ZEND_NUM_ARGS()>number_of_arguments || zend_get_parameters_array_ex(ZEND_NUM_ARGS(), arguments) == FAILURE) { WRONG_PARAM_COUNT; @@ -507,12 +507,12 @@ ZEND_FUNCTION(dbx_error) { int number_of_arguments=1; - zval ** arguments[1]; + zval **arguments[1]; int result; - zval ** dbx_handle; - zval ** dbx_module; - zval ** dbx_database; + zval **dbx_handle; + zval **dbx_module; + zval **dbx_database; zval * rv_errormsg; if (ZEND_NUM_ARGS() !=number_of_arguments || zend_get_parameters_array_ex(number_of_arguments, arguments) == FAILURE) { @@ -550,9 +550,9 @@ long comparison_type=DBX_CMP_NATIVE; double dtemp; long ltemp; - zval ** arguments[4]; - zval ** zv_a; - zval ** zv_b; + zval **arguments[4]; + zval **zv_a; + zval **zv_b; int result=0; number_of_arguments=ZEND_NUM_ARGS(); if (number_of_arguments<min_number_of_arguments || number_of_arguments>max_number_of_arguments || zend_get_parameters_array_ex(number_of_arguments, arguments) == FAILURE) { @@ -636,8 +636,8 @@ ZEND_FUNCTION(dbx_sort) { int number_of_arguments=2; - zval ** arguments[2]; - zval ** zval_data; + zval **arguments[2]; + zval **zval_data; zval * returned_zval; int result=0; if (ZEND_NUM_ARGS() !=number_of_arguments || zend_get_parameters_array_ex(number_of_arguments, arguments) == FAILURE) { @@ -668,7 +668,7 @@ /* * switch_dbx functions */ -int switch_dbx_connect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS, zval ** dbx_module) { +int switch_dbx_connect(zval **rv, zval **host, zval **db, zval **username, zval **password, INTERNAL_FUNCTION_PARAMETERS, zval **dbx_module) { /* returns connection handle as resource on success or 0 as long on failure */ switch ((*dbx_module)->value.lval) { case DBX_MYSQL: return dbx_mysql_connect(rv, host, db, username, password, INTERNAL_FUNCTION_PARAM_PASSTHRU); @@ -682,7 +682,7 @@ return 0; } -int switch_dbx_pconnect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS, zval ** dbx_module) { +int switch_dbx_pconnect(zval **rv, zval **host, zval **db, zval **username, zval **password, INTERNAL_FUNCTION_PARAMETERS, zval **dbx_module) { /* returns persistent connection handle as resource on success or 0 as long on failure */ switch ((*dbx_module)->value.lval) { case DBX_MYSQL: return dbx_mysql_pconnect(rv, host, db, username, password, INTERNAL_FUNCTION_PARAM_PASSTHRU); @@ -696,7 +696,7 @@ return 0; } -int switch_dbx_close(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETERS, zval ** dbx_module) { +int switch_dbx_close(zval **rv, zval **dbx_handle, INTERNAL_FUNCTION_PARAMETERS, zval **dbx_module) { /* returns 1 as long on success or 0 as long on failure */ switch ((*dbx_module)->value.lval) { case DBX_MYSQL: return dbx_mysql_close(rv, dbx_handle, INTERNAL_FUNCTION_PARAM_PASSTHRU); @@ -710,7 +710,7 @@ return 0; } -int switch_dbx_query(zval ** rv, zval ** dbx_handle, zval ** db_name, zval ** sql_statement, INTERNAL_FUNCTION_PARAMETERS, zval ** dbx_module) { +int switch_dbx_query(zval **rv, zval **dbx_handle, zval **db_name, zval **sql_statement, INTERNAL_FUNCTION_PARAMETERS, zval **dbx_module) { /* returns 1 as long or result identifier as resource on success or 0 as long on failure */ switch ((*dbx_module)->value.lval) { case DBX_MYSQL: return dbx_mysql_query(rv, dbx_handle, db_name, sql_statement, INTERNAL_FUNCTION_PARAM_PASSTHRU); @@ -724,7 +724,7 @@ return 0; } -int switch_dbx_getcolumncount(zval ** rv, zval ** result_handle, INTERNAL_FUNCTION_PARAMETERS, zval ** dbx_module) { +int switch_dbx_getcolumncount(zval **rv, zval **result_handle, INTERNAL_FUNCTION_PARAMETERS, zval **dbx_module) { /* returns column-count as long on success or 0 as long on failure */ switch ((*dbx_module)->value.lval) { case DBX_MYSQL: return dbx_mysql_getcolumncount(rv, result_handle, INTERNAL_FUNCTION_PARAM_PASSTHRU); @@ -738,7 +738,7 @@ return 0; } -int switch_dbx_getcolumnname(zval ** rv, zval ** result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS, zval ** dbx_module) { +int switch_dbx_getcolumnname(zval **rv, zval **result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS, zval **dbx_module) { /* returns column-name as string on success or 0 as long on failure */ switch ((*dbx_module)->value.lval) { case DBX_MYSQL: return dbx_mysql_getcolumnname(rv, result_handle, column_index, INTERNAL_FUNCTION_PARAM_PASSTHRU); @@ -752,7 +752,7 @@ return 0; } -int switch_dbx_getcolumntype(zval ** rv, zval ** result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS, zval ** dbx_module) { +int switch_dbx_getcolumntype(zval **rv, zval **result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS, zval **dbx_module) { /* returns column-type as string on success or 0 as long on failure */ switch ((*dbx_module)->value.lval) { case DBX_MYSQL: return dbx_mysql_getcolumntype(rv, result_handle, column_index, INTERNAL_FUNCTION_PARAM_PASSTHRU); @@ -766,7 +766,7 @@ return 0; } -int switch_dbx_getrow(zval ** rv, zval ** result_handle, long row_number, INTERNAL_FUNCTION_PARAMETERS, zval ** dbx_module) { +int switch_dbx_getrow(zval **rv, zval **result_handle, long row_number, INTERNAL_FUNCTION_PARAMETERS, zval **dbx_module) { /* returns array[0..columncount-1] as strings on success or 0 as long on failure */ switch ((*dbx_module)->value.lval) { case DBX_MYSQL: return dbx_mysql_getrow(rv, result_handle, row_number, INTERNAL_FUNCTION_PARAM_PASSTHRU); @@ -780,7 +780,7 @@ return 0; } -int switch_dbx_error(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETERS, zval ** dbx_module) { +int switch_dbx_error(zval **rv, zval **dbx_handle, INTERNAL_FUNCTION_PARAMETERS, zval **dbx_module) { /* returns string */ switch ((*dbx_module)->value.lval) { case DBX_MYSQL: return dbx_mysql_error(rv, dbx_handle, INTERNAL_FUNCTION_PARAM_PASSTHRU); Index: php4/ext/dbx/dbx.dsp diff -u php4/ext/dbx/dbx.dsp:1.6 php4/ext/dbx/dbx.dsp:1.7 --- php4/ext/dbx/dbx.dsp:1.6 Fri Aug 17 08:54:23 2001 +++ php4/ext/dbx/dbx.dsp Fri Aug 17 09:00:46 2001 @@ -1,6 +1,6 @@ # Microsoft Developer Studio Project File - Name="dbx" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** +# **DO NOT EDIT ** # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 Index: php4/ext/dbx/dbx.h diff -u php4/ext/dbx/dbx.h:1.6 php4/ext/dbx/dbx.h:1.7 --- php4/ext/dbx/dbx.h:1.6 Tue Aug 7 15:09:58 2001 +++ php4/ext/dbx/dbx.h Fri Aug 17 09:00:46 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dbx.h,v 1.6 2001/08/07 19:09:58 fmk Exp $ */ +/* $Id: dbx.h,v 1.7 2001/08/17 13:00:46 andi Exp $ */ #ifndef ZEND_DBX_H #define ZEND_DBX_H @@ -45,7 +45,7 @@ #define MOVE_RETURNED_TO_RV(rv, returned_zval) { **rv = *returned_zval; zval_copy_ctor(*rv); zval_ptr_dtor(&returned_zval); } -void dbx_call_any_function(INTERNAL_FUNCTION_PARAMETERS, char * function_name, zval ** returnvalue, int number_of_arguments, zval *** params); +void dbx_call_any_function(INTERNAL_FUNCTION_PARAMETERS, char * function_name, zval **returnvalue, int number_of_arguments, zval *** params); #endif /* ZEND_DBX_H */ Index: php4/ext/dbx/dbx_fbsql.c diff -u php4/ext/dbx/dbx_fbsql.c:1.2 php4/ext/dbx/dbx_fbsql.c:1.3 --- php4/ext/dbx/dbx_fbsql.c:1.2 Tue Aug 7 15:09:58 2001 +++ php4/ext/dbx/dbx_fbsql.c Fri Aug 17 09:00:46 2001 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dbx_fbsql.c,v 1.2 2001/08/07 19:09:58 fmk Exp $ */ +/* $Id: dbx_fbsql.c,v 1.3 2001/08/17 13:00:46 andi Exp $ */ #include "dbx.h" #include "dbx_fbsql.h" @@ -29,10 +29,10 @@ #define FBSQL_ASSOC 1<<0 #define FBSQL_NUM 1<<1 -int dbx_fbsql_connect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_fbsql_connect(zval **rv, zval **host, zval **db, zval **username, zval **password, INTERNAL_FUNCTION_PARAMETERS) { /* returns connection handle as resource on success or 0 as long on failure */ int number_of_arguments=3; - zval ** arguments[3]; + zval **arguments[3]; zval * returned_zval=NULL; zval * select_db_zval=NULL; @@ -67,10 +67,10 @@ return 1; } -int dbx_fbsql_pconnect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_fbsql_pconnect(zval **rv, zval **host, zval **db, zval **username, zval **password, INTERNAL_FUNCTION_PARAMETERS) { /* returns persistent connection handle as resource on success or 0 as long on failure */ int number_of_arguments=3; - zval ** arguments[3]; + zval **arguments[3]; zval * returned_zval=NULL; zval * select_db_zval=NULL; @@ -105,10 +105,10 @@ return 1; } -int dbx_fbsql_close(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_fbsql_close(zval **rv, zval **dbx_handle, INTERNAL_FUNCTION_PARAMETERS) { /* returns 1 as long on success or 0 as long on failure */ int number_of_arguments=1; - zval ** arguments[1]; + zval **arguments[1]; zval * returned_zval=NULL; arguments[0]=dbx_handle; @@ -121,10 +121,10 @@ return 1; } -int dbx_fbsql_query(zval ** rv, zval ** dbx_handle, zval ** db_name, zval ** sql_statement, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_fbsql_query(zval **rv, zval **dbx_handle, zval **db_name, zval **sql_statement, INTERNAL_FUNCTION_PARAMETERS) { /* returns 1 as long or a result identifier as resource on success or 0 as long on failure */ int number_of_arguments=3; - zval ** arguments[3]; + zval **arguments[3]; zval * returned_zval=NULL; arguments[0]=db_name; @@ -140,10 +140,10 @@ return 1; } -int dbx_fbsql_getcolumncount(zval ** rv, zval ** result_handle, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_fbsql_getcolumncount(zval **rv, zval **result_handle, INTERNAL_FUNCTION_PARAMETERS) { /* returns column-count as long on success or 0 as long on failure */ int number_of_arguments=1; - zval ** arguments[1]; + zval **arguments[1]; zval * returned_zval=NULL; arguments[0]=result_handle; @@ -156,10 +156,10 @@ return 1; } -int dbx_fbsql_getcolumnname(zval ** rv, zval ** result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_fbsql_getcolumnname(zval **rv, zval **result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS) { /* returns column-name as string on success or 0 as long on failure */ int number_of_arguments=2; - zval ** arguments[2]; + zval **arguments[2]; zval * zval_column_index; zval * returned_zval=NULL; @@ -179,10 +179,10 @@ return 1; } -int dbx_fbsql_getcolumntype(zval ** rv, zval ** result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_fbsql_getcolumntype(zval **rv, zval **result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS) { /* returns column-type as string on success or 0 as long on failure */ int number_of_arguments=2; - zval ** arguments[2]; + zval **arguments[2]; zval * zval_column_index; zval * returned_zval=NULL; @@ -203,10 +203,10 @@ return 1; } -int dbx_fbsql_getrow(zval ** rv, zval ** result_handle, long row_number, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_fbsql_getrow(zval **rv, zval **result_handle, long row_number, INTERNAL_FUNCTION_PARAMETERS) { /* returns array[0..columncount-1] as strings on success or 0 as long on failure */ int number_of_arguments=2; - zval ** arguments[2]; + zval **arguments[2]; zval * zval_resulttype=NULL; zval * returned_zval=NULL; @@ -225,10 +225,10 @@ return 1; } -int dbx_fbsql_error(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_fbsql_error(zval **rv, zval **dbx_handle, INTERNAL_FUNCTION_PARAMETERS) { /* returns string */ int number_of_arguments=1; - zval ** arguments[1]; + zval **arguments[1]; zval * returned_zval=NULL; arguments[0]=dbx_handle; Index: php4/ext/dbx/dbx_fbsql.h diff -u php4/ext/dbx/dbx_fbsql.h:1.2 php4/ext/dbx/dbx_fbsql.h:1.3 --- php4/ext/dbx/dbx_fbsql.h:1.2 Tue Aug 7 15:09:58 2001 +++ php4/ext/dbx/dbx_fbsql.h Fri Aug 17 09:00:46 2001 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dbx_fbsql.h,v 1.2 2001/08/07 19:09:58 fmk Exp $ */ +/* $Id: dbx_fbsql.h,v 1.3 2001/08/17 13:00:46 andi Exp $ */ #ifndef ZEND_DBX_FBSQL_H #define ZEND_DBX_FBSQL_H @@ -32,23 +32,23 @@ #include "php.h" -int dbx_fbsql_connect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS); +int dbx_fbsql_connect(zval **rv, zval **host, zval **db, zval **username, zval **password, INTERNAL_FUNCTION_PARAMETERS); /* returns connection handle as resource on success or 0 as long on failure */ -int dbx_fbsql_pconnect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS); +int dbx_fbsql_pconnect(zval **rv, zval **host, zval **db, zval **username, zval **password, INTERNAL_FUNCTION_PARAMETERS); /* returns persistent connection handle as resource on success or 0 as long on failure */ -int dbx_fbsql_close(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETERS); +int dbx_fbsql_close(zval **rv, zval **dbx_handle, INTERNAL_FUNCTION_PARAMETERS); /* returns 1 as long on success or 0 as long on failure */ -int dbx_fbsql_query(zval ** rv, zval ** dbx_handle, zval ** db_name, zval ** sql_statement, INTERNAL_FUNCTION_PARAMETERS); +int dbx_fbsql_query(zval **rv, zval **dbx_handle, zval **db_name, zval **sql_statement, INTERNAL_FUNCTION_PARAMETERS); /* returns 1 as long or a result identifier as resource on success or 0 as long on failure */ -int dbx_fbsql_getcolumncount(zval ** rv, zval ** result_handle, INTERNAL_FUNCTION_PARAMETERS); +int dbx_fbsql_getcolumncount(zval **rv, zval **result_handle, INTERNAL_FUNCTION_PARAMETERS); /* returns column-count as long on success or 0 as long on failure */ -int dbx_fbsql_getcolumnname(zval ** rv, zval ** result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS); +int dbx_fbsql_getcolumnname(zval **rv, zval **result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS); /* returns column-name as string on success or 0 as long on failure */ -int dbx_fbsql_getcolumntype(zval ** rv, zval ** result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS); +int dbx_fbsql_getcolumntype(zval **rv, zval **result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS); /* returns column-type as string on success or 0 as long on failure */ -int dbx_fbsql_getrow(zval ** rv, zval ** result_handle, long row_number, INTERNAL_FUNCTION_PARAMETERS); +int dbx_fbsql_getrow(zval **rv, zval **result_handle, long row_number, INTERNAL_FUNCTION_PARAMETERS); /* returns array[0..columncount-1] as strings on success or 0 as long on failure */ -int dbx_fbsql_error(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETERS); +int dbx_fbsql_error(zval **rv, zval **dbx_handle, INTERNAL_FUNCTION_PARAMETERS); /* returns string */ #endif /* ZEND_DBX_FBSQL_H */ Index: php4/ext/dbx/dbx_mssql.c diff -u php4/ext/dbx/dbx_mssql.c:1.5 php4/ext/dbx/dbx_mssql.c:1.6 --- php4/ext/dbx/dbx_mssql.c:1.5 Tue Aug 7 15:09:58 2001 +++ php4/ext/dbx/dbx_mssql.c Fri Aug 17 09:00:46 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dbx_mssql.c,v 1.5 2001/08/07 19:09:58 fmk Exp $ */ +/* $Id: dbx_mssql.c,v 1.6 2001/08/17 13:00:46 andi Exp $ */ #include "dbx.h" #include "dbx_mssql.h" @@ -28,10 +28,10 @@ #define MSSQL_ASSOC 1<<0 #define MSSQL_NUM 1<<1 -int dbx_mssql_connect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_mssql_connect(zval **rv, zval **host, zval **db, zval **username, zval **password, INTERNAL_FUNCTION_PARAMETERS) { /* returns connection handle as resource on success or 0 as long on failure */ int number_of_arguments=3; - zval ** arguments[3]; + zval **arguments[3]; zval * returned_zval=NULL; zval * select_db_zval=NULL; @@ -66,10 +66,10 @@ return 1; } -int dbx_mssql_pconnect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_mssql_pconnect(zval **rv, zval **host, zval **db, zval **username, zval **password, INTERNAL_FUNCTION_PARAMETERS) { /* returns persistent connection handle as resource on success or 0 as long on failure */ int number_of_arguments=3; - zval ** arguments[3]; + zval **arguments[3]; zval * returned_zval=NULL; zval * select_db_zval=NULL; @@ -104,10 +104,10 @@ return 1; } -int dbx_mssql_close(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_mssql_close(zval **rv, zval **dbx_handle, INTERNAL_FUNCTION_PARAMETERS) { /* returns 1 as long on success or 0 as long on failure */ int number_of_arguments=1; - zval ** arguments[1]; + zval **arguments[1]; zval * returned_zval=NULL; arguments[0]=dbx_handle; @@ -120,10 +120,10 @@ return 1; } -int dbx_mssql_query(zval ** rv, zval ** dbx_handle, zval ** db_name, zval ** sql_statement, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_mssql_query(zval **rv, zval **dbx_handle, zval **db_name, zval **sql_statement, INTERNAL_FUNCTION_PARAMETERS) { /* returns 1 as long or a result identifier as resource on success or 0 as long on failure */ int number_of_arguments=2; - zval ** arguments[2]; + zval **arguments[2]; zval * returned_zval=NULL; zval * select_db_zval=NULL; @@ -146,10 +146,10 @@ return 1; } -int dbx_mssql_getcolumncount(zval ** rv, zval ** result_handle, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_mssql_getcolumncount(zval **rv, zval **result_handle, INTERNAL_FUNCTION_PARAMETERS) { /* returns column-count as long on success or 0 as long on failure */ int number_of_arguments=1; - zval ** arguments[1]; + zval **arguments[1]; zval * returned_zval=NULL; arguments[0]=result_handle; @@ -162,10 +162,10 @@ return 1; } -int dbx_mssql_getcolumnname(zval ** rv, zval ** result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_mssql_getcolumnname(zval **rv, zval **result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS) { /* returns column-name as string on success or 0 as long on failure */ int number_of_arguments=2; - zval ** arguments[2]; + zval **arguments[2]; zval * zval_column_index; zval * returned_zval=NULL; @@ -185,10 +185,10 @@ return 1; } -int dbx_mssql_getcolumntype(zval ** rv, zval ** result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_mssql_getcolumntype(zval **rv, zval **result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS) { /* returns column-type as string on success or 0 as long on failure */ int number_of_arguments=2; - zval ** arguments[2]; + zval **arguments[2]; zval * zval_column_index; zval * returned_zval=NULL; @@ -209,10 +209,10 @@ return 1; } -int dbx_mssql_getrow(zval ** rv, zval ** result_handle, long row_number, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_mssql_getrow(zval **rv, zval **result_handle, long row_number, INTERNAL_FUNCTION_PARAMETERS) { /* returns array[0..columncount-1] as strings on success or 0 as long on failure */ int number_of_arguments=1; - zval ** arguments[1]; + zval **arguments[1]; zval * returned_zval=NULL; arguments[0]=result_handle; @@ -225,10 +225,10 @@ return 1; } -int dbx_mssql_error(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_mssql_error(zval **rv, zval **dbx_handle, INTERNAL_FUNCTION_PARAMETERS) { /* returns string */ int number_of_arguments=1; - zval ** arguments[1]; + zval **arguments[1]; zval * returned_zval=NULL; arguments[0]=dbx_handle; Index: php4/ext/dbx/dbx_mssql.h diff -u php4/ext/dbx/dbx_mssql.h:1.4 php4/ext/dbx/dbx_mssql.h:1.5 --- php4/ext/dbx/dbx_mssql.h:1.4 Tue Aug 7 15:09:58 2001 +++ php4/ext/dbx/dbx_mssql.h Fri Aug 17 09:00:46 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dbx_mssql.h,v 1.4 2001/08/07 19:09:58 fmk Exp $ */ +/* $Id: dbx_mssql.h,v 1.5 2001/08/17 13:00:46 andi Exp $ */ #ifndef ZEND_DBX_MSSQL_H #define ZEND_DBX_MSSQL_H @@ -31,23 +31,23 @@ #include "php.h" -int dbx_mssql_connect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS); +int dbx_mssql_connect(zval **rv, zval **host, zval **db, zval **username, zval **password, INTERNAL_FUNCTION_PARAMETERS); /* returns connection handle as resource on success or 0 as long on failure */ -int dbx_mssql_pconnect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS); +int dbx_mssql_pconnect(zval **rv, zval **host, zval **db, zval **username, zval **password, INTERNAL_FUNCTION_PARAMETERS); /* returns persistent connection handle as resource on success or 0 as long on failure */ -int dbx_mssql_close(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETERS); +int dbx_mssql_close(zval **rv, zval **dbx_handle, INTERNAL_FUNCTION_PARAMETERS); /* returns 1 as long on success or 0 as long on failure */ -int dbx_mssql_query(zval ** rv, zval ** dbx_handle, zval ** db_name, zval ** sql_statement, INTERNAL_FUNCTION_PARAMETERS); +int dbx_mssql_query(zval **rv, zval **dbx_handle, zval **db_name, zval **sql_statement, INTERNAL_FUNCTION_PARAMETERS); /* returns 1 as long or a result identifier as resource on success or 0 as long on failure */ -int dbx_mssql_getcolumncount(zval ** rv, zval ** result_handle, INTERNAL_FUNCTION_PARAMETERS); +int dbx_mssql_getcolumncount(zval **rv, zval **result_handle, INTERNAL_FUNCTION_PARAMETERS); /* returns column-count as long on success or 0 as long on failure */ -int dbx_mssql_getcolumnname(zval ** rv, zval ** result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS); +int dbx_mssql_getcolumnname(zval **rv, zval **result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS); /* returns column-name as string on success or 0 as long on failure */ -int dbx_mssql_getcolumntype(zval ** rv, zval ** result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS); +int dbx_mssql_getcolumntype(zval **rv, zval **result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS); /* returns column-type as string on success or 0 as long on failure */ -int dbx_mssql_getrow(zval ** rv, zval ** result_handle, long row_number, INTERNAL_FUNCTION_PARAMETERS); +int dbx_mssql_getrow(zval **rv, zval **result_handle, long row_number, INTERNAL_FUNCTION_PARAMETERS); /* returns array[0..columncount-1] as strings on success or 0 as long on failure */ -int dbx_mssql_error(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETERS); +int dbx_mssql_error(zval **rv, zval **dbx_handle, INTERNAL_FUNCTION_PARAMETERS); /* returns string */ #endif /* ZEND_DBX_MSSQL_H */ Index: php4/ext/dbx/dbx_mysql.c diff -u php4/ext/dbx/dbx_mysql.c:1.9 php4/ext/dbx/dbx_mysql.c:1.10 --- php4/ext/dbx/dbx_mysql.c:1.9 Tue Aug 7 15:09:58 2001 +++ php4/ext/dbx/dbx_mysql.c Fri Aug 17 09:00:46 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dbx_mysql.c,v 1.9 2001/08/07 19:09:58 fmk Exp $ */ +/* $Id: dbx_mysql.c,v 1.10 2001/08/17 13:00:46 andi Exp $ */ #include "dbx.h" #include "dbx_mysql.h" @@ -28,10 +28,10 @@ #define MYSQL_ASSOC 1<<0 #define MYSQL_NUM 1<<1 -int dbx_mysql_connect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_mysql_connect(zval **rv, zval **host, zval **db, zval **username, zval **password, INTERNAL_FUNCTION_PARAMETERS) { /* returns connection handle as resource on success or 0 as long on failure */ int number_of_arguments=3; - zval ** arguments[3]; + zval **arguments[3]; zval * returned_zval=NULL; zval * select_db_zval=NULL; @@ -66,10 +66,10 @@ return 1; } -int dbx_mysql_pconnect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_mysql_pconnect(zval **rv, zval **host, zval **db, zval **username, zval **password, INTERNAL_FUNCTION_PARAMETERS) { /* returns persistent connection handle as resource on success or 0 as long on failure */ int number_of_arguments=3; - zval ** arguments[3]; + zval **arguments[3]; zval * returned_zval=NULL; zval * select_db_zval=NULL; @@ -104,10 +104,10 @@ return 1; } -int dbx_mysql_close(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_mysql_close(zval **rv, zval **dbx_handle, INTERNAL_FUNCTION_PARAMETERS) { /* returns 1 as long on success or 0 as long on failure */ int number_of_arguments=1; - zval ** arguments[1]; + zval **arguments[1]; zval * returned_zval=NULL; arguments[0]=dbx_handle; @@ -120,10 +120,10 @@ return 1; } -int dbx_mysql_query(zval ** rv, zval ** dbx_handle, zval ** db_name, zval ** sql_statement, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_mysql_query(zval **rv, zval **dbx_handle, zval **db_name, zval **sql_statement, INTERNAL_FUNCTION_PARAMETERS) { /* returns 1 as long or a result identifier as resource on success or 0 as long on failure */ int number_of_arguments=3; - zval ** arguments[3]; + zval **arguments[3]; zval * returned_zval=NULL; arguments[0]=db_name; @@ -139,10 +139,10 @@ return 1; } -int dbx_mysql_getcolumncount(zval ** rv, zval ** result_handle, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_mysql_getcolumncount(zval **rv, zval **result_handle, INTERNAL_FUNCTION_PARAMETERS) { /* returns column-count as long on success or 0 as long on failure */ int number_of_arguments=1; - zval ** arguments[1]; + zval **arguments[1]; zval * returned_zval=NULL; arguments[0]=result_handle; @@ -155,10 +155,10 @@ return 1; } -int dbx_mysql_getcolumnname(zval ** rv, zval ** result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_mysql_getcolumnname(zval **rv, zval **result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS) { /* returns column-name as string on success or 0 as long on failure */ int number_of_arguments=2; - zval ** arguments[2]; + zval **arguments[2]; zval * zval_column_index; zval * returned_zval=NULL; @@ -178,10 +178,10 @@ return 1; } -int dbx_mysql_getcolumntype(zval ** rv, zval ** result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_mysql_getcolumntype(zval **rv, zval **result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS) { /* returns column-type as string on success or 0 as long on failure */ int number_of_arguments=2; - zval ** arguments[2]; + zval **arguments[2]; zval * zval_column_index; zval * returned_zval=NULL; @@ -202,10 +202,10 @@ return 1; } -int dbx_mysql_getrow(zval ** rv, zval ** result_handle, long row_number, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_mysql_getrow(zval **rv, zval **result_handle, long row_number, INTERNAL_FUNCTION_PARAMETERS) { /* returns array[0..columncount-1] as strings on success or 0 as long on failure */ int number_of_arguments=2; - zval ** arguments[2]; + zval **arguments[2]; zval * zval_resulttype=NULL; zval * returned_zval=NULL; @@ -224,10 +224,10 @@ return 1; } -int dbx_mysql_error(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_mysql_error(zval **rv, zval **dbx_handle, INTERNAL_FUNCTION_PARAMETERS) { /* returns string */ int number_of_arguments=1; - zval ** arguments[1]; + zval **arguments[1]; zval * returned_zval=NULL; arguments[0]=dbx_handle; Index: php4/ext/dbx/dbx_mysql.h diff -u php4/ext/dbx/dbx_mysql.h:1.8 php4/ext/dbx/dbx_mysql.h:1.9 --- php4/ext/dbx/dbx_mysql.h:1.8 Tue Aug 7 15:09:58 2001 +++ php4/ext/dbx/dbx_mysql.h Fri Aug 17 09:00:46 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dbx_mysql.h,v 1.8 2001/08/07 19:09:58 fmk Exp $ */ +/* $Id: dbx_mysql.h,v 1.9 2001/08/17 13:00:46 andi Exp $ */ #ifndef ZEND_DBX_MYSQL_H #define ZEND_DBX_MYSQL_H @@ -31,23 +31,23 @@ #include "php.h" -int dbx_mysql_connect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS); +int dbx_mysql_connect(zval **rv, zval **host, zval **db, zval **username, zval **password, INTERNAL_FUNCTION_PARAMETERS); /* returns connection handle as resource on success or 0 as long on failure */ -int dbx_mysql_pconnect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS); +int dbx_mysql_pconnect(zval **rv, zval **host, zval **db, zval **username, zval **password, INTERNAL_FUNCTION_PARAMETERS); /* returns persistent connection handle as resource on success or 0 as long on failure */ -int dbx_mysql_close(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETERS); +int dbx_mysql_close(zval **rv, zval **dbx_handle, INTERNAL_FUNCTION_PARAMETERS); /* returns 1 as long on success or 0 as long on failure */ -int dbx_mysql_query(zval ** rv, zval ** dbx_handle, zval ** db_name, zval ** sql_statement, INTERNAL_FUNCTION_PARAMETERS); +int dbx_mysql_query(zval **rv, zval **dbx_handle, zval **db_name, zval **sql_statement, INTERNAL_FUNCTION_PARAMETERS); /* returns 1 as long or a result identifier as resource on success or 0 as long on failure */ -int dbx_mysql_getcolumncount(zval ** rv, zval ** result_handle, INTERNAL_FUNCTION_PARAMETERS); +int dbx_mysql_getcolumncount(zval **rv, zval **result_handle, INTERNAL_FUNCTION_PARAMETERS); /* returns column-count as long on success or 0 as long on failure */ -int dbx_mysql_getcolumnname(zval ** rv, zval ** result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS); +int dbx_mysql_getcolumnname(zval **rv, zval **result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS); /* returns column-name as string on success or 0 as long on failure */ -int dbx_mysql_getcolumntype(zval ** rv, zval ** result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS); +int dbx_mysql_getcolumntype(zval **rv, zval **result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS); /* returns column-type as string on success or 0 as long on failure */ -int dbx_mysql_getrow(zval ** rv, zval ** result_handle, long row_number, INTERNAL_FUNCTION_PARAMETERS); +int dbx_mysql_getrow(zval **rv, zval **result_handle, long row_number, INTERNAL_FUNCTION_PARAMETERS); /* returns array[0..columncount-1] as strings on success or 0 as long on failure */ -int dbx_mysql_error(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETERS); +int dbx_mysql_error(zval **rv, zval **dbx_handle, INTERNAL_FUNCTION_PARAMETERS); /* returns string */ #endif /* ZEND_DBX_MYSQL_H */ Index: php4/ext/dbx/dbx_oci8.c diff -u php4/ext/dbx/dbx_oci8.c:1.1 php4/ext/dbx/dbx_oci8.c:1.2 --- php4/ext/dbx/dbx_oci8.c:1.1 Fri Aug 17 08:54:23 2001 +++ php4/ext/dbx/dbx_oci8.c Fri Aug 17 09:00:46 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dbx_oci8.c,v 1.1 2001/08/17 12:54:23 mboeren Exp $ */ +/* $Id: dbx_oci8.c,v 1.2 2001/08/17 13:00:46 andi Exp $ */ #include "dbx.h" #include "dbx_oci8.h" @@ -30,10 +30,10 @@ #define OCI_RETURN_NULLS 1<<2 #define OCI_RETURN_LOBS 1<<3 -int dbx_oci8_connect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_oci8_connect(zval **rv, zval **host, zval **db, zval **username, zval **password, INTERNAL_FUNCTION_PARAMETERS) { /* returns connection handle as resource on success or 0 as long on failure */ int number_of_arguments=3; - zval ** arguments[3]; + zval **arguments[3]; zval * returned_zval=NULL; arguments[0]=username; @@ -48,10 +48,10 @@ return 1; } -int dbx_oci8_pconnect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_oci8_pconnect(zval **rv, zval **host, zval **db, zval **username, zval **password, INTERNAL_FUNCTION_PARAMETERS) { /* returns connection handle as resource on success or 0 as long on failure */ int number_of_arguments=3; - zval ** arguments[3]; + zval **arguments[3]; zval * returned_zval=NULL; arguments[0]=username; @@ -66,10 +66,10 @@ return 1; } -int dbx_oci8_close(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_oci8_close(zval **rv, zval **dbx_handle, INTERNAL_FUNCTION_PARAMETERS) { /* returns 1 as long on success or 0 as long on failure */ int number_of_arguments=1; - zval ** arguments[1]; + zval **arguments[1]; zval * returned_zval=NULL; arguments[0]=dbx_handle; @@ -82,10 +82,10 @@ return 1; } -int dbx_oci8_query(zval ** rv, zval ** dbx_handle, zval ** db_name, zval ** sql_statement, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_oci8_query(zval **rv, zval **dbx_handle, zval **db_name, zval **sql_statement, INTERNAL_FUNCTION_PARAMETERS) { /* returns 1 as long or a result identifier as resource on success or 0 as long on failure */ int number_of_arguments=2; - zval ** arguments[2]; + zval **arguments[2]; zval * returned_zval=NULL; zval * execute_zval=NULL; @@ -110,10 +110,10 @@ return 1; } -int dbx_oci8_getcolumncount(zval ** rv, zval ** result_handle, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_oci8_getcolumncount(zval **rv, zval **result_handle, INTERNAL_FUNCTION_PARAMETERS) { /* returns column-count as long on success or 0 as long on failure */ int number_of_arguments=1; - zval ** arguments[1]; + zval **arguments[1]; zval * returned_zval=NULL; arguments[0]=result_handle; @@ -126,10 +126,10 @@ return 1; } -int dbx_oci8_getcolumnname(zval ** rv, zval ** result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_oci8_getcolumnname(zval **rv, zval **result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS) { /* returns column-name as string on success or 0 as long on failure */ int number_of_arguments=2; - zval ** arguments[2]; + zval **arguments[2]; zval * zval_column_index; zval * returned_zval=NULL; @@ -150,10 +150,10 @@ return 1; } -int dbx_oci8_getcolumntype(zval ** rv, zval ** result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_oci8_getcolumntype(zval **rv, zval **result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS) { /* returns column-type as string on success or 0 as long on failure */ int number_of_arguments=2; - zval ** arguments[2]; + zval **arguments[2]; zval * zval_column_index; zval * returned_zval=NULL; @@ -175,10 +175,10 @@ return 1; } -int dbx_oci8_getrow(zval ** rv, zval ** result_handle, long row_number, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_oci8_getrow(zval **rv, zval **result_handle, long row_number, INTERNAL_FUNCTION_PARAMETERS) { /* returns array[0..columncount-1] as strings on success or 0 as long on failure */ int number_of_arguments=3; - zval ** arguments[3]; + zval **arguments[3]; zval * zval_resulttype=NULL; zval * zval_returned_array=NULL; zval * returned_zval=NULL; @@ -202,10 +202,10 @@ return 1; } -int dbx_oci8_error(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_oci8_error(zval **rv, zval **dbx_handle, INTERNAL_FUNCTION_PARAMETERS) { /* returns string */ int number_of_arguments=1; - zval ** arguments[1]; + zval **arguments[1]; zval * returned_zval=NULL; zval * returned_message_zval=NULL; arguments[0]=dbx_handle; Index: php4/ext/dbx/dbx_oci8.h diff -u php4/ext/dbx/dbx_oci8.h:1.1 php4/ext/dbx/dbx_oci8.h:1.2 --- php4/ext/dbx/dbx_oci8.h:1.1 Fri Aug 17 08:54:23 2001 +++ php4/ext/dbx/dbx_oci8.h Fri Aug 17 09:00:46 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dbx_oci8.h,v 1.1 2001/08/17 12:54:23 mboeren Exp $ */ +/* $Id: dbx_oci8.h,v 1.2 2001/08/17 13:00:46 andi Exp $ */ #ifndef ZEND_DBX_OCI8_H #define ZEND_DBX_OCI8_H @@ -31,23 +31,23 @@ #include "php.h" -int dbx_oci8_connect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS); +int dbx_oci8_connect(zval **rv, zval **host, zval **db, zval **username, zval **password, INTERNAL_FUNCTION_PARAMETERS); /* returns connection handle as resource on success or 0 as long on failure */ -int dbx_oci8_pconnect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS); +int dbx_oci8_pconnect(zval **rv, zval **host, zval **db, zval **username, zval **password, INTERNAL_FUNCTION_PARAMETERS); /* returns persistent connection handle as resource on success or 0 as long on failure */ -int dbx_oci8_close(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETERS); +int dbx_oci8_close(zval **rv, zval **dbx_handle, INTERNAL_FUNCTION_PARAMETERS); /* returns 1 as long on success or 0 as long on failure */ -int dbx_oci8_query(zval ** rv, zval ** dbx_handle, zval ** db_name, zval ** sql_statement, INTERNAL_FUNCTION_PARAMETERS); +int dbx_oci8_query(zval **rv, zval **dbx_handle, zval **db_name, zval **sql_statement, INTERNAL_FUNCTION_PARAMETERS); /* returns 1 as long or a result identifier as resource on success or 0 as long on failure */ -int dbx_oci8_getcolumncount(zval ** rv, zval ** result_handle, INTERNAL_FUNCTION_PARAMETERS); +int dbx_oci8_getcolumncount(zval **rv, zval **result_handle, INTERNAL_FUNCTION_PARAMETERS); /* returns column-count as long on success or 0 as long on failure */ -int dbx_oci8_getcolumnname(zval ** rv, zval ** result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS); +int dbx_oci8_getcolumnname(zval **rv, zval **result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS); /* returns column-name as string on success or 0 as long on failure */ -int dbx_oci8_getcolumntype(zval ** rv, zval ** result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS); +int dbx_oci8_getcolumntype(zval **rv, zval **result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS); /* returns column-type as string on success or 0 as long on failure */ -int dbx_oci8_getrow(zval ** rv, zval ** result_handle, long row_number, INTERNAL_FUNCTION_PARAMETERS); +int dbx_oci8_getrow(zval **rv, zval **result_handle, long row_number, INTERNAL_FUNCTION_PARAMETERS); /* returns array[0..columncount-1] as strings on success or 0 as long on failure */ -int dbx_oci8_error(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETERS); +int dbx_oci8_error(zval **rv, zval **dbx_handle, INTERNAL_FUNCTION_PARAMETERS); /* returns string */ #endif /* ZEND_DBX_OCI8_H */ Index: php4/ext/dbx/dbx_odbc.c diff -u php4/ext/dbx/dbx_odbc.c:1.11 php4/ext/dbx/dbx_odbc.c:1.12 --- php4/ext/dbx/dbx_odbc.c:1.11 Tue Aug 7 15:09:58 2001 +++ php4/ext/dbx/dbx_odbc.c Fri Aug 17 09:00:46 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dbx_odbc.c,v 1.11 2001/08/07 19:09:58 fmk Exp $ */ +/* $Id: dbx_odbc.c,v 1.12 2001/08/17 13:00:46 andi Exp $ */ #include "dbx.h" #include "dbx_odbc.h" @@ -28,10 +28,10 @@ #define ODBC_ASSOC 1 #define ODBC_NUM 2 -int dbx_odbc_connect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_odbc_connect(zval **rv, zval **host, zval **db, zval **username, zval **password, INTERNAL_FUNCTION_PARAMETERS) { /* returns connection handle as resource on success or 0 as long on failure */ int number_of_arguments=3; - zval ** arguments[3]; + zval **arguments[3]; zval * returned_zval=NULL; arguments[0]=db; @@ -46,10 +46,10 @@ return 1; } -int dbx_odbc_pconnect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_odbc_pconnect(zval **rv, zval **host, zval **db, zval **username, zval **password, INTERNAL_FUNCTION_PARAMETERS) { /* returns connection handle as resource on success or 0 as long on failure */ int number_of_arguments=3; - zval ** arguments[3]; + zval **arguments[3]; zval * returned_zval=NULL; arguments[0]=db; @@ -64,10 +64,10 @@ return 1; } -int dbx_odbc_close(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_odbc_close(zval **rv, zval **dbx_handle, INTERNAL_FUNCTION_PARAMETERS) { /* returns 1 as long on success or 0 as long on failure */ int number_of_arguments=1; - zval ** arguments[1]; + zval **arguments[1]; zval * returned_zval=NULL; int exit_status=EG(exit_status); @@ -91,10 +91,10 @@ return 1; } -int dbx_odbc_query(zval ** rv, zval ** dbx_handle, zval ** db_name, zval ** sql_statement, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_odbc_query(zval **rv, zval **dbx_handle, zval **db_name, zval **sql_statement, INTERNAL_FUNCTION_PARAMETERS) { /* returns 1 as long or a result identifier as resource on success or 0 as long on failure */ int number_of_arguments=2; - zval ** arguments[2]; + zval **arguments[2]; zval * queryresult_zval=NULL; zval * num_fields_zval=NULL; @@ -126,10 +126,10 @@ return 1; } -int dbx_odbc_getcolumncount(zval ** rv, zval ** result_handle, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_odbc_getcolumncount(zval **rv, zval **result_handle, INTERNAL_FUNCTION_PARAMETERS) { /* returns column-count as long on success or 0 as long on failure */ int number_of_arguments=1; - zval ** arguments[1]; + zval **arguments[1]; zval * returned_zval=NULL; arguments[0]=result_handle; @@ -142,10 +142,10 @@ return 1; } -int dbx_odbc_getcolumnname(zval ** rv, zval ** result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_odbc_getcolumnname(zval **rv, zval **result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS) { /* returns column-name as string on success or 0 as long on failure */ int number_of_arguments=2; - zval ** arguments[2]; + zval **arguments[2]; zval * zval_column_index; zval * returned_zval=NULL; @@ -165,10 +165,10 @@ return 1; } -int dbx_odbc_getcolumntype(zval ** rv, zval ** result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_odbc_getcolumntype(zval **rv, zval **result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS) { /* returns column-type as string on success or 0 as long on failure */ int number_of_arguments=2; - zval ** arguments[2]; + zval **arguments[2]; zval * zval_column_index; zval * returned_zval=NULL; @@ -189,10 +189,10 @@ return 1; } -int dbx_odbc_getrow(zval ** rv, zval ** result_handle, long row_number, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_odbc_getrow(zval **rv, zval **result_handle, long row_number, INTERNAL_FUNCTION_PARAMETERS) { /* returns array[0..columncount-1] as strings on success or 0 as long on failure */ int number_of_arguments; - zval ** arguments[2]; + zval **arguments[2]; zval * num_fields_zval=NULL; zval * fetch_row_result_zval=NULL; zval * field_result_zval=NULL; @@ -247,10 +247,10 @@ return 1; } -int dbx_odbc_error(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_odbc_error(zval **rv, zval **dbx_handle, INTERNAL_FUNCTION_PARAMETERS) { /* returns string */ int number_of_arguments=1; - zval ** arguments[1]; + zval **arguments[1]; zval * returned_zval=NULL; arguments[0]=dbx_handle; Index: php4/ext/dbx/dbx_odbc.h diff -u php4/ext/dbx/dbx_odbc.h:1.8 php4/ext/dbx/dbx_odbc.h:1.9 --- php4/ext/dbx/dbx_odbc.h:1.8 Tue Aug 7 15:09:58 2001 +++ php4/ext/dbx/dbx_odbc.h Fri Aug 17 09:00:46 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dbx_odbc.h,v 1.8 2001/08/07 19:09:58 fmk Exp $ */ +/* $Id: dbx_odbc.h,v 1.9 2001/08/17 13:00:46 andi Exp $ */ #ifndef ZEND_DBX_ODBC_H #define ZEND_DBX_ODBC_H @@ -31,23 +31,23 @@ #include "php.h" -int dbx_odbc_connect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS); +int dbx_odbc_connect(zval **rv, zval **host, zval **db, zval **username, zval **password, INTERNAL_FUNCTION_PARAMETERS); /* returns connection handle as resource on success or 0 as long on failure */ -int dbx_odbc_pconnect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS); +int dbx_odbc_pconnect(zval **rv, zval **host, zval **db, zval **username, zval **password, INTERNAL_FUNCTION_PARAMETERS); /* returns persisten connection handle as resource on success or 0 as long on failure */ -int dbx_odbc_close(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETERS); +int dbx_odbc_close(zval **rv, zval **dbx_handle, INTERNAL_FUNCTION_PARAMETERS); /* returns 1 as long on success or 0 as long on failure */ -int dbx_odbc_query(zval ** rv, zval ** dbx_handle, zval ** db_name, zval ** sql_statement, INTERNAL_FUNCTION_PARAMETERS); +int dbx_odbc_query(zval **rv, zval **dbx_handle, zval **db_name, zval **sql_statement, INTERNAL_FUNCTION_PARAMETERS); /* returns 1 as long or a result identifier as resource on success or 0 as long on failure */ -int dbx_odbc_getcolumncount(zval ** rv, zval ** result_handle, INTERNAL_FUNCTION_PARAMETERS); +int dbx_odbc_getcolumncount(zval **rv, zval **result_handle, INTERNAL_FUNCTION_PARAMETERS); /* returns column-count as long on success or 0 as long on failure */ -int dbx_odbc_getcolumnname(zval ** rv, zval ** result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS); +int dbx_odbc_getcolumnname(zval **rv, zval **result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS); /* returns column-name as string on success or 0 as long on failure */ -int dbx_odbc_getcolumntype(zval ** rv, zval ** result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS); +int dbx_odbc_getcolumntype(zval **rv, zval **result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS); /* returns column-type as string on success or 0 as long on failure */ -int dbx_odbc_getrow(zval ** rv, zval ** result_handle, long row_number, INTERNAL_FUNCTION_PARAMETERS); +int dbx_odbc_getrow(zval **rv, zval **result_handle, long row_number, INTERNAL_FUNCTION_PARAMETERS); /* returns array[0..columncount-1] as strings on success or 0 as long on failure */ -int dbx_odbc_error(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETERS); +int dbx_odbc_error(zval **rv, zval **dbx_handle, INTERNAL_FUNCTION_PARAMETERS); /* returns string */ #endif /* ZEND_DBX_ODBC_H */ Index: php4/ext/dbx/dbx_pgsql.c diff -u php4/ext/dbx/dbx_pgsql.c:1.11 php4/ext/dbx/dbx_pgsql.c:1.12 --- php4/ext/dbx/dbx_pgsql.c:1.11 Sat Aug 11 12:38:24 2001 +++ php4/ext/dbx/dbx_pgsql.c Fri Aug 17 09:00:46 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dbx_pgsql.c,v 1.11 2001/08/11 16:38:24 zeev Exp $ */ +/* $Id: dbx_pgsql.c,v 1.12 2001/08/17 13:00:46 andi Exp $ */ #include "dbx.h" #include "php_dbx.h" @@ -26,7 +26,7 @@ #define PGSQL_ASSOC 1<<0 #define PGSQL_NUM 1<<1 -int dbx_pgsql_connect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_pgsql_connect(zval **rv, zval **host, zval **db, zval **username, zval **password, INTERNAL_FUNCTION_PARAMETERS) { /* returns connection handle as resource on success or 0 as long on failure */ int nargs=5; char *port="5432", *connstring=NULL; @@ -71,7 +71,7 @@ return 1; } -int dbx_pgsql_pconnect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_pgsql_pconnect(zval **rv, zval **host, zval **db, zval **username, zval **password, INTERNAL_FUNCTION_PARAMETERS) { /* returns persistent connection handle as resource on success or 0 as long on failure */ int nargs=5; char *port="5432", *connstring=NULL; @@ -116,10 +116,10 @@ return 1; } -int dbx_pgsql_close(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_pgsql_close(zval **rv, zval **dbx_handle, INTERNAL_FUNCTION_PARAMETERS) { /* returns 1 as long on success or 0 as long on failure */ int number_of_arguments=1; - zval ** arguments[1]; + zval **arguments[1]; zval * returned_zval=NULL; arguments[0]=dbx_handle; @@ -132,7 +132,7 @@ return 1; } -int dbx_pgsql_query(zval ** rv, zval ** dbx_handle, zval ** db_name, zval ** sql_statement, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_pgsql_query(zval **rv, zval **dbx_handle, zval **db_name, zval **sql_statement, INTERNAL_FUNCTION_PARAMETERS) { /* returns 1 as long or a result identifier as resource on success or 0 as long on failure */ int nargs=2; @@ -154,10 +154,10 @@ return 1; } -int dbx_pgsql_getcolumncount(zval ** rv, zval ** result_handle, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_pgsql_getcolumncount(zval **rv, zval **result_handle, INTERNAL_FUNCTION_PARAMETERS) { /* returns column-count as long on success or 0 as long on failure */ int number_of_arguments=1; - zval ** arguments[1]; + zval **arguments[1]; zval * returned_zval=NULL; arguments[0]=result_handle; @@ -170,10 +170,10 @@ return 1; } -int dbx_pgsql_getcolumnname(zval ** rv, zval ** result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_pgsql_getcolumnname(zval **rv, zval **result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS) { /* returns column-name as string on success or 0 as long on failure */ int number_of_arguments=2; - zval ** arguments[2]; + zval **arguments[2]; zval * zval_column_index; zval * returned_zval=NULL; @@ -193,10 +193,10 @@ return 1; } -int dbx_pgsql_getcolumntype(zval ** rv, zval ** result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_pgsql_getcolumntype(zval **rv, zval **result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS) { /* returns column-type as string on success or 0 as long on failure */ int number_of_arguments=2; - zval ** arguments[2]; + zval **arguments[2]; zval * zval_column_index; zval * returned_zval=NULL; @@ -217,11 +217,11 @@ return 1; } -int dbx_pgsql_getrow(zval ** rv, zval ** result_handle, long row_number, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_pgsql_getrow(zval **rv, zval **result_handle, long row_number, INTERNAL_FUNCTION_PARAMETERS) { /* returns array[0..columncount-1] as strings on success or 0 as long on failure */ int number_of_arguments=2; int save_error_reporting=0; - zval ** arguments[2]; + zval **arguments[2]; zval * zval_row=NULL; zval * returned_zval=NULL; @@ -248,10 +248,10 @@ return 1; } -int dbx_pgsql_error(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_pgsql_error(zval **rv, zval **dbx_handle, INTERNAL_FUNCTION_PARAMETERS) { /* returns string */ int number_of_arguments=1; - zval ** arguments[1]; + zval **arguments[1]; zval * returned_zval=NULL; arguments[0]=dbx_handle; Index: php4/ext/dbx/dbx_pgsql.h diff -u php4/ext/dbx/dbx_pgsql.h:1.7 php4/ext/dbx/dbx_pgsql.h:1.8 --- php4/ext/dbx/dbx_pgsql.h:1.7 Tue Aug 7 15:09:58 2001 +++ php4/ext/dbx/dbx_pgsql.h Fri Aug 17 09:00:46 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dbx_pgsql.h,v 1.7 2001/08/07 19:09:58 fmk Exp $ */ +/* $Id: dbx_pgsql.h,v 1.8 2001/08/17 13:00:46 andi Exp $ */ #ifndef ZEND_DBX_PGSQL_H #define ZEND_DBX_PGSQL_H @@ -27,23 +27,23 @@ #include "php.h" -int dbx_pgsql_connect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS); +int dbx_pgsql_connect(zval **rv, zval **host, zval **db, zval **username, zval **password, INTERNAL_FUNCTION_PARAMETERS); /* returns connection handle as resource on success or 0 as long on failure */ -int dbx_pgsql_pconnect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS); +int dbx_pgsql_pconnect(zval **rv, zval **host, zval **db, zval **username, zval **password, INTERNAL_FUNCTION_PARAMETERS); /* returns persistent connection handle as resource on success or 0 as long on failure */ -int dbx_pgsql_close(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETERS); +int dbx_pgsql_close(zval **rv, zval **dbx_handle, INTERNAL_FUNCTION_PARAMETERS); /* returns 1 as long on success or 0 as long on failure */ -int dbx_pgsql_query(zval ** rv, zval ** dbx_handle, zval ** db_name, zval ** sql_statement, INTERNAL_FUNCTION_PARAMETERS); +int dbx_pgsql_query(zval **rv, zval **dbx_handle, zval **db_name, zval **sql_statement, INTERNAL_FUNCTION_PARAMETERS); /* returns 1 as long or a result identifier as resource on success or 0 as long on failure */ -int dbx_pgsql_getcolumncount(zval ** rv, zval ** result_handle, INTERNAL_FUNCTION_PARAMETERS); +int dbx_pgsql_getcolumncount(zval **rv, zval **result_handle, INTERNAL_FUNCTION_PARAMETERS); /* returns column-count as long on success or 0 as long on failure */ -int dbx_pgsql_getcolumnname(zval ** rv, zval ** result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS); +int dbx_pgsql_getcolumnname(zval **rv, zval **result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS); /* returns column-name as string on success or 0 as long on failure */ -int dbx_pgsql_getcolumntype(zval ** rv, zval ** result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS); +int dbx_pgsql_getcolumntype(zval **rv, zval **result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS); /* returns column-type as string on success or 0 as long on failure */ -int dbx_pgsql_getrow(zval ** rv, zval ** result_handle, long row_number, INTERNAL_FUNCTION_PARAMETERS); +int dbx_pgsql_getrow(zval **rv, zval **result_handle, long row_number, INTERNAL_FUNCTION_PARAMETERS); /* returns array[0..columncount-1] as strings on success or 0 as long on failure */ -int dbx_pgsql_error(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETERS); +int dbx_pgsql_error(zval **rv, zval **dbx_handle, INTERNAL_FUNCTION_PARAMETERS); /* returns string */ #endif /* ZEND_DBX_PGSQL_H */ Index: php4/ext/dbx/howto_extend_dbx.html diff -u php4/ext/dbx/howto_extend_dbx.html:1.1 php4/ext/dbx/howto_extend_dbx.html:1.2 --- php4/ext/dbx/howto_extend_dbx.html:1.1 Fri May 4 05:39:52 2001 +++ php4/ext/dbx/howto_extend_dbx.html Fri Aug 17 09:00:46 2001 @@ -135,7 +135,7 @@ </pre> Finally, for the implementation of all switch_dbx_XXXXX functions, copy a 'case'-line for every function that you support (should be all functions!). Here is an example for only the switch_dbx_connect function:<br> <pre class="code"> -int switch_dbx_connect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS, zval ** dbx_module) { +int switch_dbx_connect(zval **rv, zval **host, zval **db, zval **username, zval **password, INTERNAL_FUNCTION_PARAMETERS, zval **dbx_module) { // returns connection handle as resource on success or 0 as long on failure switch ((*dbx_module)->value.lval) { case DBX_MYSQL: return dbx_mysql_connect(rv, host, db, username, password, INTERNAL_FUNCTION_PARAM_PASSTHRU); @@ -177,11 +177,11 @@ <p> The details of what each of the functions do, what parameters they get, and what parameters they should return are discussed below. But first, the dbx_mysql_connect function is presented and explained, so you get an idea of how things work.<br> <pre class="code"> -int dbx_mysql_connect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_mysql_connect(zval **rv, zval **host, zval **db, zval **username, zval **password, INTERNAL_FUNCTION_PARAMETERS) { // returns connection handle as resource on success or 0 as long on // failure int number_of_arguments; - zval ** arguments[3]; + zval **arguments[3]; zval * returned_zval=NULL; zval * select_db_zval=NULL; @@ -208,11 +208,11 @@ First of all, all functions return 0 on failure and 1 on success. These values are used in the dbx-routines, they are never actually given back to the PHP-script writer that calls the dbx_connect function.<br> The actual value that is of interest to the caller is returned in the <span class="bold">rv</span> parameter. In this case it is a connection handle (or link identifier, in mysql-speak), that is also returned if the database selection doesn't succeed. <br> The parameters that are of interest to the function are located between the <span class="bold">rv</span> and <span class="bold">INTERNAL_FUNCTION_PARAMETERS</span> parameters, in this case it is a <span class="bold">host</span> name, a <span class="bold">db</span> name, a <span class="bold">username</span> and a <span class="bold">password</span>. These are the values that the user specifies if he calls dbx_connect(); These parameters are used in the calls to the mysql-database functions. The user actually also specifies a module-name, that decides which connect-function should be called. Here, he specified 'mysql'.<br> -To actually call a mysql module function, you can use <span class="bold">dbx_call_any_function</span> where you specify the function name (it is used twice in dbx_mysql_connect, see <span class="bold">'mysql_connect'</span> and <span class="bold">'mysql_select_db'</span>, they are printed bold in the code). The value that is returned from the function will be stored in the next argument, a zval * (e.g. <span class="bold">returned_zval</span>) parameter that you must declare locally. To actually return such a parameter, use the <span class="bold">MOVE_RETURNED_TO_RV(rv, returned_zval)</span> macro, which copies the values to <span class="bold">rv</span> and frees anything that may be left in <span class="bold">returned_zval</span>. Parameters that must be passed to the mysql-function are stored in the <span class="bold">arguments</span> array, which must be large enough to hold all parameters to the function-call that requires the most parameters (in this case, mysql_connect expects 3 parameters, mysql_select_db expects two parameters, so the <span class="bold">arguments</span> array is defined 'zval ** arguments[<span class="bold">3</span>]'). The <span class="bold">number_of_arguments</span> parameter is set to the actual number of arguments that the function-call requires. As you can see it is initialized to 3, for the first call to mysql_connect. Then it is set to 2, for the call to mysql_select_db. If you call a function that retrieves a value, and you don't return it with MOVE_RETURNED_TO_RV, then you must free the value using <span class="bold">zval_ptr_dtor</span>, as can be seen right after the call to mysql_select_db. This can also be seen directly after the call to mysql_connect, if somehow this function failed or didn't return a resource (on a successful connect mysql_connect returns a resource) the returned value is freed as well (and 0 is returned because the connection failed).<br> +To actually call a mysql module function, you can use <span class="bold">dbx_call_any_function</span> where you specify the function name (it is used twice in dbx_mysql_connect, see <span class="bold">'mysql_connect'</span> and <span class="bold">'mysql_select_db'</span>, they are printed bold in the code). The value that is returned from the function will be stored in the next argument, a zval * (e.g. <span class="bold">returned_zval</span>) parameter that you must declare locally. To actually return such a parameter, use the <span class="bold">MOVE_RETURNED_TO_RV(rv, returned_zval)</span> macro, which copies the values to <span class="bold">rv</span> and frees anything that may be left in <span class="bold">returned_zval</span>. Parameters that must be passed to the mysql-function are stored in the <span class="bold">arguments</span> array, which must be large enough to hold all parameters to the function-call that requires the most parameters (in this case, mysql_connect expects 3 parameters, mysql_select_db expects two parameters, so the <span class="bold">arguments</span> array is defined 'zval **arguments[<span class="bold">3</span>]'). The <span class="bold">number_of_arguments</span> parameter is set to the actual number of arguments that the function-call requires. As you can see it is initialized to 3, for the first call to mysql_connect. Then it is set to 2, for the call to mysql_select_db. If you call a function that retrieves a value, and you don't return it with MOVE_RETURNED_TO_RV, then you must free the value using <span class="bold">zval_ptr_dtor</span>, as can be seen right after the call to mysql_select_db. This can also be seen directly after the call to mysql_connect, if somehow this function failed or didn't return a resource (on a successful connect mysql_connect returns a resource) the returned value is freed as well (and 0 is returned because the connection failed).<br> <p> OK, now the description of all functions that you should implement, and what is expected of them...<br> <a name="connect"></a><pre class="code"> -int <span class="fn-name">dbx_blabla_connect</span>(zval ** rv, zval ** <span class="fn-param">host</span>, zval ** <span class="fn-param">db</span>, zval ** <span class="fn-param">username</span>, zval ** <span class="fn-param">password</span>, INTERNAL_FUNCTION_PARAMETERS); +int <span class="fn-name">dbx_blabla_connect</span>(zval **rv, zval **<span class="fn-param">host</span>, zval **<span class="fn-param">db</span>, zval **<span class="fn-param">username</span>, zval **<span class="fn-param">password</span>, INTERNAL_FUNCTION_PARAMETERS); // int: returns 0 on connect-failure and 1 on success // rv: connection handle as resource on success or nothing on failure </pre> @@ -223,14 +223,14 @@ The db (string) is the name of the database to select, or, for e.g. ODBC, the identifier that is needed to actually select the database.<br> The username (string) and password (string) are used for authentication.<br> <a name="pconnect"></a><pre class="code"> -int <span class="fn-name">dbx_blabla_pconnect</span>(zval ** rv, zval ** <span class="fn-param">host</span>, zval ** <span class="fn-param">db</span>, zval ** <span class="fn-param">username</span>, zval ** <span class="fn-param">password</span>, INTERNAL_FUNCTION_PARAMETERS); +int <span class="fn-name">dbx_blabla_pconnect</span>(zval **rv, zval **<span class="fn-param">host</span>, zval **<span class="fn-param">db</span>, zval **<span class="fn-param">username</span>, zval **<span class="fn-param">password</span>, INTERNAL_FUNCTION_PARAMETERS); // int: returns 0 on pconnect-failure and 1 on success // rv: persistent connection handle as resource on success or nothing // on failure </pre> dbx_blabla_pconnect is identical to dbx_blabla_connect except that it will create a persistent connection.<br> <a name="close"></a><pre class="code"> -int <span class="fn-name">dbx_blabla_close</span>(zval ** rv, zval ** <span class="fn-param">dbx_handle</span>, INTERNAL_FUNCTION_PARAMETERS); +int <span class="fn-name">dbx_blabla_close</span>(zval **rv, zval **<span class="fn-param">dbx_handle</span>, INTERNAL_FUNCTION_PARAMETERS); // int: returns 0 on close-failure and 1 on success // rv: 1 as bool on success or nothing on failure </pre> @@ -239,7 +239,7 @@ What must be returned from the function is a 1 on success and a 0 on failure. Note that an unsuccessful close is still a succeeded function call.<br> The dbx_handle is the same value that you returned from dbx_blabla_connect or dbx_blabla_pconnect.<br> <a name="query"></a><pre class="code"> -int <span class="fn-name">dbx_blabla_query</span>(zval ** rv, zval ** <span class="fn-param">dbx_handle</span>, zval ** <span class="fn-param">sql_statement</span>, INTERNAL_FUNCTION_PARAMETERS); +int <span class="fn-name">dbx_blabla_query</span>(zval **rv, zval **<span class="fn-param">dbx_handle</span>, zval **<span class="fn-param">sql_statement</span>, INTERNAL_FUNCTION_PARAMETERS); // int: returns 0 on query-failure and 1 on success // rv: 1 as bool or a result identifier as resource on success // or nothing on failure @@ -250,7 +250,7 @@ The dbx_handle is the same value that you returned from dbx_blabla_connect or dbx_blabla_pconnect.<br> The sql_statement (string) can have any value.<br> <a name="getcolumncount"></a><pre class="code"> -int <span class="fn-name">dbx_blabla_getcolumncount</span>(zval ** rv, zval ** <span class="fn-param">result_handle</span>, INTERNAL_FUNCTION_PARAMETERS); +int <span class="fn-name">dbx_blabla_getcolumncount</span>(zval **rv, zval **<span class="fn-param">result_handle</span>, INTERNAL_FUNCTION_PARAMETERS); // int: returns 0 on query-failure and 1 on success // returns column-count as long on success or nothing on failure </pre> @@ -259,7 +259,7 @@ What must be returned from the function is a 1 on success and a 0 on failure. <br> The result_handle is the same value that you returned from dbx_query.<br> <a name="getcolumnname"></a><pre class="code"> -int <span class="fn-name">dbx_blabla_getcolumnname</span>(zval ** rv, zval ** <span class="fn-param">result_handle</span>, long <span class="fn-param">column_index</span>, INTERNAL_FUNCTION_PARAMETERS); +int <span class="fn-name">dbx_blabla_getcolumnname</span>(zval **rv, zval **<span class="fn-param">result_handle</span>, long <span class="fn-param">column_index</span>, INTERNAL_FUNCTION_PARAMETERS); // int: returns 0 on failure and 1 on success // returns column-name as string on success or nothing on failure </pre> @@ -269,7 +269,7 @@ The result_handle is the same value that you returned from dbx_query.<br> The column_index is a long that ranges from 0 to the value you returned from dbx_blabla_getcolumncount minus 1 [0..columncount-1].<br> <a name="getcolumntype"></a><pre class="code"> -int <span class="fn-name">dbx_blabla_getcolumntype</span>(zval ** rv, zval ** <span class="fn-param">result_handle</span>, long <span class="fn-param">column_index</span>, INTERNAL_FUNCTION_PARAMETERS); +int <span class="fn-name">dbx_blabla_getcolumntype</span>(zval **rv, zval **<span class="fn-param">result_handle</span>, long <span class="fn-param">column_index</span>, INTERNAL_FUNCTION_PARAMETERS); // int: returns 0 on failure and 1 on success // returns column-type as string on success or nothing on failure </pre> @@ -279,7 +279,7 @@ The result_handle is the same value that you returned from dbx_query.<br> The column_index is a long that ranges from 0 to the value you returned from dbx_blabla_getcolumncount minus 1 [0..columncount-1].<br> <a name="getrow"></a><pre class="code"> -int <span class="fn-name">dbx_blabla_getrow</span>(zval ** rv, zval ** <span class="fn-param">result_handle</span>, long <span class="fn-param">row_number</span>, INTERNAL_FUNCTION_PARAMETERS); +int <span class="fn-name">dbx_blabla_getrow</span>(zval **rv, zval **<span class="fn-param">result_handle</span>, long <span class="fn-param">row_number</span>, INTERNAL_FUNCTION_PARAMETERS); // int: returns 0 on failure and 1 on success // returns array[0..columncount-1] as strings on success or 0 as long // on failure @@ -290,7 +290,7 @@ What must be returned from the function is a 1 on success and a 0 on failure (function failed or there are no more rows available). <br> The result_handle is the same value that you returned from dbx_query.<br> <a name="error"></a><pre class="code"> -int <span class="fn-name">dbx_blabla_error</span>(zval ** rv, zval ** <span class="fn-param">dbx_handle</span>, INTERNAL_FUNCTION_PARAMETERS); +int <span class="fn-name">dbx_blabla_error</span>(zval **rv, zval **<span class="fn-param">dbx_handle</span>, INTERNAL_FUNCTION_PARAMETERS); // int: returns 0 on failure and 1 on success // returns error message as string </pre>
Index: php4/ext/dbx/dbx.c diff -u php4/ext/dbx/dbx.c:1.23 php4/ext/dbx/dbx.c:1.24 --- php4/ext/dbx/dbx.c:1.23 Fri Aug 17 08:54:23 2001 +++ php4/ext/dbx/dbx.c Fri Aug 17 09:00:46 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dbx.c,v 1.23 2001/08/17 12:54:23 mboeren Exp $ */ +/* $Id: dbx.c,v 1.24 2001/08/17 13:00:46 andi Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -78,7 +78,7 @@ return DBX_UNKNOWN; } -int split_dbx_handle_object(zval ** dbx_object, zval *** pdbx_handle, zval *** pdbx_module, zval *** pdbx_database) { +int split_dbx_handle_object(zval **dbx_object, zval *** pdbx_handle, zval *** pdbx_module, zval *** pdbx_database) { convert_to_object_ex(dbx_object); if (zend_hash_find(Z_OBJPROP_PP(dbx_object), "handle", 7, (void **) pdbx_handle)==FAILURE || zend_hash_find(Z_OBJPROP_PP(dbx_object), "module", 7, (void **) pdbx_module)==FAILURE @@ -89,7 +89,7 @@ } /* from dbx.h, to be used in support-files (dbx_mysql.c etc...) */ -void dbx_call_any_function(INTERNAL_FUNCTION_PARAMETERS, char * function_name, zval ** returnvalue, int number_of_arguments, zval ***params) +void dbx_call_any_function(INTERNAL_FUNCTION_PARAMETERS, char * function_name, zval **returnvalue, int number_of_arguments, zval ***params) { zval * zval_function_name; @@ -110,23 +110,23 @@ * do NOT use the return_value parameter from INTERNAL_FUNCTION_PARAMETERS * you can additionally return 0 or 1 for failure or success which will also be returned by the switches */ -int switch_dbx_connect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS, zval ** dbx_module); +int switch_dbx_connect(zval **rv, zval **host, zval **db, zval **username, zval **password, INTERNAL_FUNCTION_PARAMETERS, zval **dbx_module); /* returns connection handle as resource on success or 0 as long on failure */ -int switch_dbx_pconnect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS, zval ** dbx_module); +int switch_dbx_pconnect(zval **rv, zval **host, zval **db, zval **username, zval **password, INTERNAL_FUNCTION_PARAMETERS, zval **dbx_module); /* returns persistent connection handle as resource on success or 0 as long on failure */ -int switch_dbx_close(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETERS, zval ** dbx_module); +int switch_dbx_close(zval **rv, zval **dbx_handle, INTERNAL_FUNCTION_PARAMETERS, zval **dbx_module); /* returns 1 as long on success or 0 as long on failure */ -int switch_dbx_query(zval ** rv, zval ** dbx_handle, zval ** db_name, zval ** sql_statement, INTERNAL_FUNCTION_PARAMETERS, zval ** dbx_module); +int switch_dbx_query(zval **rv, zval **dbx_handle, zval **db_name, zval **sql_statement, INTERNAL_FUNCTION_PARAMETERS, zval **dbx_module); /* returns 1 as long or result identifier as resource on success or 0 as long on failure */ -int switch_dbx_getcolumncount(zval ** rv, zval ** result_handle, INTERNAL_FUNCTION_PARAMETERS, zval ** dbx_module); +int switch_dbx_getcolumncount(zval **rv, zval **result_handle, INTERNAL_FUNCTION_PARAMETERS, zval **dbx_module); /* returns column-count as long on success or 0 as long on failure */ -int switch_dbx_getcolumnname(zval ** rv, zval ** result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS, zval ** dbx_module); +int switch_dbx_getcolumnname(zval **rv, zval **result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS, zval **dbx_module); /* returns column-name as string on success or 0 as long on failure */ -int switch_dbx_getcolumntype(zval ** rv, zval ** result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS, zval ** dbx_module); +int switch_dbx_getcolumntype(zval **rv, zval **result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS, zval **dbx_module); /* returns column-type as string on success or 0 as long on failure */ -int switch_dbx_getrow(zval ** rv, zval ** result_handle, long row_number, INTERNAL_FUNCTION_PARAMETERS, zval ** dbx_module); +int switch_dbx_getrow(zval **rv, zval **result_handle, long row_number, INTERNAL_FUNCTION_PARAMETERS, zval **dbx_module); /* returns array[0..columncount-1] as strings on success or 0 as long on failure */ -int switch_dbx_error(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETERS, zval ** dbx_module); +int switch_dbx_error(zval **rv, zval **dbx_handle, INTERNAL_FUNCTION_PARAMETERS, zval **dbx_module); /* returns string */ /* Every user visible function must have an entry in dbx_functions[]. @@ -219,7 +219,7 @@ ZEND_FUNCTION(dbx_connect) { int number_of_arguments=5; - zval ** arguments[6]; + zval **arguments[6]; int result; long module_identifier; @@ -301,12 +301,12 @@ ZEND_FUNCTION(dbx_close) { int number_of_arguments=1; - zval ** arguments[1]; + zval **arguments[1]; int result; - zval ** dbx_handle; - zval ** dbx_module; - zval ** dbx_database; + zval **dbx_handle; + zval **dbx_module; + zval **dbx_database; zval * rv_success; if (ZEND_NUM_ARGS() !=number_of_arguments || zend_get_parameters_array_ex(number_of_arguments, arguments) == FAILURE) { @@ -338,12 +338,12 @@ { int min_number_of_arguments=2; int number_of_arguments=3; - zval ** arguments[3]; + zval **arguments[3]; int result; - zval ** dbx_handle; - zval ** dbx_module; - zval ** dbx_database; + zval **dbx_handle; + zval **dbx_module; + zval **dbx_database; zval * rv_result_handle; zval * rv_column_count; long col_index; @@ -351,8 +351,8 @@ zval * info; long info_flags; zval * data; - zval ** row_ptr; - zval ** inforow_ptr; + zval **row_ptr; + zval **inforow_ptr; if (ZEND_NUM_ARGS()<min_number_of_arguments || ZEND_NUM_ARGS()>number_of_arguments || zend_get_parameters_array_ex(ZEND_NUM_ARGS(), arguments) == FAILURE) { WRONG_PARAM_COUNT; @@ -507,12 +507,12 @@ ZEND_FUNCTION(dbx_error) { int number_of_arguments=1; - zval ** arguments[1]; + zval **arguments[1]; int result; - zval ** dbx_handle; - zval ** dbx_module; - zval ** dbx_database; + zval **dbx_handle; + zval **dbx_module; + zval **dbx_database; zval * rv_errormsg; if (ZEND_NUM_ARGS() !=number_of_arguments || zend_get_parameters_array_ex(number_of_arguments, arguments) == FAILURE) { @@ -550,9 +550,9 @@ long comparison_type=DBX_CMP_NATIVE; double dtemp; long ltemp; - zval ** arguments[4]; - zval ** zv_a; - zval ** zv_b; + zval **arguments[4]; + zval **zv_a; + zval **zv_b; int result=0; number_of_arguments=ZEND_NUM_ARGS(); if (number_of_arguments<min_number_of_arguments || number_of_arguments>max_number_of_arguments || zend_get_parameters_array_ex(number_of_arguments, arguments) == FAILURE) { @@ -636,8 +636,8 @@ ZEND_FUNCTION(dbx_sort) { int number_of_arguments=2; - zval ** arguments[2]; - zval ** zval_data; + zval **arguments[2]; + zval **zval_data; zval * returned_zval; int result=0; if (ZEND_NUM_ARGS() !=number_of_arguments || zend_get_parameters_array_ex(number_of_arguments, arguments) == FAILURE) { @@ -668,7 +668,7 @@ /* * switch_dbx functions */ -int switch_dbx_connect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS, zval ** dbx_module) { +int switch_dbx_connect(zval **rv, zval **host, zval **db, zval **username, zval **password, INTERNAL_FUNCTION_PARAMETERS, zval **dbx_module) { /* returns connection handle as resource on success or 0 as long on failure */ switch ((*dbx_module)->value.lval) { case DBX_MYSQL: return dbx_mysql_connect(rv, host, db, username, password, INTERNAL_FUNCTION_PARAM_PASSTHRU); @@ -682,7 +682,7 @@ return 0; } -int switch_dbx_pconnect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS, zval ** dbx_module) { +int switch_dbx_pconnect(zval **rv, zval **host, zval **db, zval **username, zval **password, INTERNAL_FUNCTION_PARAMETERS, zval **dbx_module) { /* returns persistent connection handle as resource on success or 0 as long on failure */ switch ((*dbx_module)->value.lval) { case DBX_MYSQL: return dbx_mysql_pconnect(rv, host, db, username, password, INTERNAL_FUNCTION_PARAM_PASSTHRU); @@ -696,7 +696,7 @@ return 0; } -int switch_dbx_close(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETERS, zval ** dbx_module) { +int switch_dbx_close(zval **rv, zval **dbx_handle, INTERNAL_FUNCTION_PARAMETERS, zval **dbx_module) { /* returns 1 as long on success or 0 as long on failure */ switch ((*dbx_module)->value.lval) { case DBX_MYSQL: return dbx_mysql_close(rv, dbx_handle, INTERNAL_FUNCTION_PARAM_PASSTHRU); @@ -710,7 +710,7 @@ return 0; } -int switch_dbx_query(zval ** rv, zval ** dbx_handle, zval ** db_name, zval ** sql_statement, INTERNAL_FUNCTION_PARAMETERS, zval ** dbx_module) { +int switch_dbx_query(zval **rv, zval **dbx_handle, zval **db_name, zval **sql_statement, INTERNAL_FUNCTION_PARAMETERS, zval **dbx_module) { /* returns 1 as long or result identifier as resource on success or 0 as long on failure */ switch ((*dbx_module)->value.lval) { case DBX_MYSQL: return dbx_mysql_query(rv, dbx_handle, db_name, sql_statement, INTERNAL_FUNCTION_PARAM_PASSTHRU); @@ -724,7 +724,7 @@ return 0; } -int switch_dbx_getcolumncount(zval ** rv, zval ** result_handle, INTERNAL_FUNCTION_PARAMETERS, zval ** dbx_module) { +int switch_dbx_getcolumncount(zval **rv, zval **result_handle, INTERNAL_FUNCTION_PARAMETERS, zval **dbx_module) { /* returns column-count as long on success or 0 as long on failure */ switch ((*dbx_module)->value.lval) { case DBX_MYSQL: return dbx_mysql_getcolumncount(rv, result_handle, INTERNAL_FUNCTION_PARAM_PASSTHRU); @@ -738,7 +738,7 @@ return 0; } -int switch_dbx_getcolumnname(zval ** rv, zval ** result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS, zval ** dbx_module) { +int switch_dbx_getcolumnname(zval **rv, zval **result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS, zval **dbx_module) { /* returns column-name as string on success or 0 as long on failure */ switch ((*dbx_module)->value.lval) { case DBX_MYSQL: return dbx_mysql_getcolumnname(rv, result_handle, column_index, INTERNAL_FUNCTION_PARAM_PASSTHRU); @@ -752,7 +752,7 @@ return 0; } -int switch_dbx_getcolumntype(zval ** rv, zval ** result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS, zval ** dbx_module) { +int switch_dbx_getcolumntype(zval **rv, zval **result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS, zval **dbx_module) { /* returns column-type as string on success or 0 as long on failure */ switch ((*dbx_module)->value.lval) { case DBX_MYSQL: return dbx_mysql_getcolumntype(rv, result_handle, column_index, INTERNAL_FUNCTION_PARAM_PASSTHRU); @@ -766,7 +766,7 @@ return 0; } -int switch_dbx_getrow(zval ** rv, zval ** result_handle, long row_number, INTERNAL_FUNCTION_PARAMETERS, zval ** dbx_module) { +int switch_dbx_getrow(zval **rv, zval **result_handle, long row_number, INTERNAL_FUNCTION_PARAMETERS, zval **dbx_module) { /* returns array[0..columncount-1] as strings on success or 0 as long on failure */ switch ((*dbx_module)->value.lval) { case DBX_MYSQL: return dbx_mysql_getrow(rv, result_handle, row_number, INTERNAL_FUNCTION_PARAM_PASSTHRU); @@ -780,7 +780,7 @@ return 0; } -int switch_dbx_error(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETERS, zval ** dbx_module) { +int switch_dbx_error(zval **rv, zval **dbx_handle, INTERNAL_FUNCTION_PARAMETERS, zval **dbx_module) { /* returns string */ switch ((*dbx_module)->value.lval) { case DBX_MYSQL: return dbx_mysql_error(rv, dbx_handle, INTERNAL_FUNCTION_PARAM_PASSTHRU); Index: php4/ext/dbx/dbx.dsp diff -u php4/ext/dbx/dbx.dsp:1.6 php4/ext/dbx/dbx.dsp:1.7 --- php4/ext/dbx/dbx.dsp:1.6 Fri Aug 17 08:54:23 2001 +++ php4/ext/dbx/dbx.dsp Fri Aug 17 09:00:46 2001 @@ -1,6 +1,6 @@ # Microsoft Developer Studio Project File - Name="dbx" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** +# **DO NOT EDIT ** # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 Index: php4/ext/dbx/dbx.h diff -u php4/ext/dbx/dbx.h:1.6 php4/ext/dbx/dbx.h:1.7 --- php4/ext/dbx/dbx.h:1.6 Tue Aug 7 15:09:58 2001 +++ php4/ext/dbx/dbx.h Fri Aug 17 09:00:46 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dbx.h,v 1.6 2001/08/07 19:09:58 fmk Exp $ */ +/* $Id: dbx.h,v 1.7 2001/08/17 13:00:46 andi Exp $ */ #ifndef ZEND_DBX_H #define ZEND_DBX_H @@ -45,7 +45,7 @@ #define MOVE_RETURNED_TO_RV(rv, returned_zval) { **rv = *returned_zval; zval_copy_ctor(*rv); zval_ptr_dtor(&returned_zval); } -void dbx_call_any_function(INTERNAL_FUNCTION_PARAMETERS, char * function_name, zval ** returnvalue, int number_of_arguments, zval *** params); +void dbx_call_any_function(INTERNAL_FUNCTION_PARAMETERS, char * function_name, zval **returnvalue, int number_of_arguments, zval *** params); #endif /* ZEND_DBX_H */ Index: php4/ext/dbx/dbx_fbsql.c diff -u php4/ext/dbx/dbx_fbsql.c:1.2 php4/ext/dbx/dbx_fbsql.c:1.3 --- php4/ext/dbx/dbx_fbsql.c:1.2 Tue Aug 7 15:09:58 2001 +++ php4/ext/dbx/dbx_fbsql.c Fri Aug 17 09:00:46 2001 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dbx_fbsql.c,v 1.2 2001/08/07 19:09:58 fmk Exp $ */ +/* $Id: dbx_fbsql.c,v 1.3 2001/08/17 13:00:46 andi Exp $ */ #include "dbx.h" #include "dbx_fbsql.h" @@ -29,10 +29,10 @@ #define FBSQL_ASSOC 1<<0 #define FBSQL_NUM 1<<1 -int dbx_fbsql_connect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_fbsql_connect(zval **rv, zval **host, zval **db, zval **username, zval **password, INTERNAL_FUNCTION_PARAMETERS) { /* returns connection handle as resource on success or 0 as long on failure */ int number_of_arguments=3; - zval ** arguments[3]; + zval **arguments[3]; zval * returned_zval=NULL; zval * select_db_zval=NULL; @@ -67,10 +67,10 @@ return 1; } -int dbx_fbsql_pconnect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_fbsql_pconnect(zval **rv, zval **host, zval **db, zval **username, zval **password, INTERNAL_FUNCTION_PARAMETERS) { /* returns persistent connection handle as resource on success or 0 as long on failure */ int number_of_arguments=3; - zval ** arguments[3]; + zval **arguments[3]; zval * returned_zval=NULL; zval * select_db_zval=NULL; @@ -105,10 +105,10 @@ return 1; } -int dbx_fbsql_close(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_fbsql_close(zval **rv, zval **dbx_handle, INTERNAL_FUNCTION_PARAMETERS) { /* returns 1 as long on success or 0 as long on failure */ int number_of_arguments=1; - zval ** arguments[1]; + zval **arguments[1]; zval * returned_zval=NULL; arguments[0]=dbx_handle; @@ -121,10 +121,10 @@ return 1; } -int dbx_fbsql_query(zval ** rv, zval ** dbx_handle, zval ** db_name, zval ** sql_statement, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_fbsql_query(zval **rv, zval **dbx_handle, zval **db_name, zval **sql_statement, INTERNAL_FUNCTION_PARAMETERS) { /* returns 1 as long or a result identifier as resource on success or 0 as long on failure */ int number_of_arguments=3; - zval ** arguments[3]; + zval **arguments[3]; zval * returned_zval=NULL; arguments[0]=db_name; @@ -140,10 +140,10 @@ return 1; } -int dbx_fbsql_getcolumncount(zval ** rv, zval ** result_handle, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_fbsql_getcolumncount(zval **rv, zval **result_handle, INTERNAL_FUNCTION_PARAMETERS) { /* returns column-count as long on success or 0 as long on failure */ int number_of_arguments=1; - zval ** arguments[1]; + zval **arguments[1]; zval * returned_zval=NULL; arguments[0]=result_handle; @@ -156,10 +156,10 @@ return 1; } -int dbx_fbsql_getcolumnname(zval ** rv, zval ** result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_fbsql_getcolumnname(zval **rv, zval **result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS) { /* returns column-name as string on success or 0 as long on failure */ int number_of_arguments=2; - zval ** arguments[2]; + zval **arguments[2]; zval * zval_column_index; zval * returned_zval=NULL; @@ -179,10 +179,10 @@ return 1; } -int dbx_fbsql_getcolumntype(zval ** rv, zval ** result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_fbsql_getcolumntype(zval **rv, zval **result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS) { /* returns column-type as string on success or 0 as long on failure */ int number_of_arguments=2; - zval ** arguments[2]; + zval **arguments[2]; zval * zval_column_index; zval * returned_zval=NULL; @@ -203,10 +203,10 @@ return 1; } -int dbx_fbsql_getrow(zval ** rv, zval ** result_handle, long row_number, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_fbsql_getrow(zval **rv, zval **result_handle, long row_number, INTERNAL_FUNCTION_PARAMETERS) { /* returns array[0..columncount-1] as strings on success or 0 as long on failure */ int number_of_arguments=2; - zval ** arguments[2]; + zval **arguments[2]; zval * zval_resulttype=NULL; zval * returned_zval=NULL; @@ -225,10 +225,10 @@ return 1; } -int dbx_fbsql_error(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_fbsql_error(zval **rv, zval **dbx_handle, INTERNAL_FUNCTION_PARAMETERS) { /* returns string */ int number_of_arguments=1; - zval ** arguments[1]; + zval **arguments[1]; zval * returned_zval=NULL; arguments[0]=dbx_handle; Index: php4/ext/dbx/dbx_fbsql.h diff -u php4/ext/dbx/dbx_fbsql.h:1.2 php4/ext/dbx/dbx_fbsql.h:1.3 --- php4/ext/dbx/dbx_fbsql.h:1.2 Tue Aug 7 15:09:58 2001 +++ php4/ext/dbx/dbx_fbsql.h Fri Aug 17 09:00:46 2001 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dbx_fbsql.h,v 1.2 2001/08/07 19:09:58 fmk Exp $ */ +/* $Id: dbx_fbsql.h,v 1.3 2001/08/17 13:00:46 andi Exp $ */ #ifndef ZEND_DBX_FBSQL_H #define ZEND_DBX_FBSQL_H @@ -32,23 +32,23 @@ #include "php.h" -int dbx_fbsql_connect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS); +int dbx_fbsql_connect(zval **rv, zval **host, zval **db, zval **username, zval **password, INTERNAL_FUNCTION_PARAMETERS); /* returns connection handle as resource on success or 0 as long on failure */ -int dbx_fbsql_pconnect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS); +int dbx_fbsql_pconnect(zval **rv, zval **host, zval **db, zval **username, zval **password, INTERNAL_FUNCTION_PARAMETERS); /* returns persistent connection handle as resource on success or 0 as long on failure */ -int dbx_fbsql_close(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETERS); +int dbx_fbsql_close(zval **rv, zval **dbx_handle, INTERNAL_FUNCTION_PARAMETERS); /* returns 1 as long on success or 0 as long on failure */ -int dbx_fbsql_query(zval ** rv, zval ** dbx_handle, zval ** db_name, zval ** sql_statement, INTERNAL_FUNCTION_PARAMETERS); +int dbx_fbsql_query(zval **rv, zval **dbx_handle, zval **db_name, zval **sql_statement, INTERNAL_FUNCTION_PARAMETERS); /* returns 1 as long or a result identifier as resource on success or 0 as long on failure */ -int dbx_fbsql_getcolumncount(zval ** rv, zval ** result_handle, INTERNAL_FUNCTION_PARAMETERS); +int dbx_fbsql_getcolumncount(zval **rv, zval **result_handle, INTERNAL_FUNCTION_PARAMETERS); /* returns column-count as long on success or 0 as long on failure */ -int dbx_fbsql_getcolumnname(zval ** rv, zval ** result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS); +int dbx_fbsql_getcolumnname(zval **rv, zval **result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS); /* returns column-name as string on success or 0 as long on failure */ -int dbx_fbsql_getcolumntype(zval ** rv, zval ** result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS); +int dbx_fbsql_getcolumntype(zval **rv, zval **result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS); /* returns column-type as string on success or 0 as long on failure */ -int dbx_fbsql_getrow(zval ** rv, zval ** result_handle, long row_number, INTERNAL_FUNCTION_PARAMETERS); +int dbx_fbsql_getrow(zval **rv, zval **result_handle, long row_number, INTERNAL_FUNCTION_PARAMETERS); /* returns array[0..columncount-1] as strings on success or 0 as long on failure */ -int dbx_fbsql_error(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETERS); +int dbx_fbsql_error(zval **rv, zval **dbx_handle, INTERNAL_FUNCTION_PARAMETERS); /* returns string */ #endif /* ZEND_DBX_FBSQL_H */ Index: php4/ext/dbx/dbx_mssql.c diff -u php4/ext/dbx/dbx_mssql.c:1.5 php4/ext/dbx/dbx_mssql.c:1.6 --- php4/ext/dbx/dbx_mssql.c:1.5 Tue Aug 7 15:09:58 2001 +++ php4/ext/dbx/dbx_mssql.c Fri Aug 17 09:00:46 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dbx_mssql.c,v 1.5 2001/08/07 19:09:58 fmk Exp $ */ +/* $Id: dbx_mssql.c,v 1.6 2001/08/17 13:00:46 andi Exp $ */ #include "dbx.h" #include "dbx_mssql.h" @@ -28,10 +28,10 @@ #define MSSQL_ASSOC 1<<0 #define MSSQL_NUM 1<<1 -int dbx_mssql_connect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_mssql_connect(zval **rv, zval **host, zval **db, zval **username, zval **password, INTERNAL_FUNCTION_PARAMETERS) { /* returns connection handle as resource on success or 0 as long on failure */ int number_of_arguments=3; - zval ** arguments[3]; + zval **arguments[3]; zval * returned_zval=NULL; zval * select_db_zval=NULL; @@ -66,10 +66,10 @@ return 1; } -int dbx_mssql_pconnect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_mssql_pconnect(zval **rv, zval **host, zval **db, zval **username, zval **password, INTERNAL_FUNCTION_PARAMETERS) { /* returns persistent connection handle as resource on success or 0 as long on failure */ int number_of_arguments=3; - zval ** arguments[3]; + zval **arguments[3]; zval * returned_zval=NULL; zval * select_db_zval=NULL; @@ -104,10 +104,10 @@ return 1; } -int dbx_mssql_close(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_mssql_close(zval **rv, zval **dbx_handle, INTERNAL_FUNCTION_PARAMETERS) { /* returns 1 as long on success or 0 as long on failure */ int number_of_arguments=1; - zval ** arguments[1]; + zval **arguments[1]; zval * returned_zval=NULL; arguments[0]=dbx_handle; @@ -120,10 +120,10 @@ return 1; } -int dbx_mssql_query(zval ** rv, zval ** dbx_handle, zval ** db_name, zval ** sql_statement, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_mssql_query(zval **rv, zval **dbx_handle, zval **db_name, zval **sql_statement, INTERNAL_FUNCTION_PARAMETERS) { /* returns 1 as long or a result identifier as resource on success or 0 as long on failure */ int number_of_arguments=2; - zval ** arguments[2]; + zval **arguments[2]; zval * returned_zval=NULL; zval * select_db_zval=NULL; @@ -146,10 +146,10 @@ return 1; } -int dbx_mssql_getcolumncount(zval ** rv, zval ** result_handle, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_mssql_getcolumncount(zval **rv, zval **result_handle, INTERNAL_FUNCTION_PARAMETERS) { /* returns column-count as long on success or 0 as long on failure */ int number_of_arguments=1; - zval ** arguments[1]; + zval **arguments[1]; zval * returned_zval=NULL; arguments[0]=result_handle; @@ -162,10 +162,10 @@ return 1; } -int dbx_mssql_getcolumnname(zval ** rv, zval ** result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_mssql_getcolumnname(zval **rv, zval **result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS) { /* returns column-name as string on success or 0 as long on failure */ int number_of_arguments=2; - zval ** arguments[2]; + zval **arguments[2]; zval * zval_column_index; zval * returned_zval=NULL; @@ -185,10 +185,10 @@ return 1; } -int dbx_mssql_getcolumntype(zval ** rv, zval ** result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_mssql_getcolumntype(zval **rv, zval **result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS) { /* returns column-type as string on success or 0 as long on failure */ int number_of_arguments=2; - zval ** arguments[2]; + zval **arguments[2]; zval * zval_column_index; zval * returned_zval=NULL; @@ -209,10 +209,10 @@ return 1; } -int dbx_mssql_getrow(zval ** rv, zval ** result_handle, long row_number, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_mssql_getrow(zval **rv, zval **result_handle, long row_number, INTERNAL_FUNCTION_PARAMETERS) { /* returns array[0..columncount-1] as strings on success or 0 as long on failure */ int number_of_arguments=1; - zval ** arguments[1]; + zval **arguments[1]; zval * returned_zval=NULL; arguments[0]=result_handle; @@ -225,10 +225,10 @@ return 1; } -int dbx_mssql_error(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_mssql_error(zval **rv, zval **dbx_handle, INTERNAL_FUNCTION_PARAMETERS) { /* returns string */ int number_of_arguments=1; - zval ** arguments[1]; + zval **arguments[1]; zval * returned_zval=NULL; arguments[0]=dbx_handle; Index: php4/ext/dbx/dbx_mssql.h diff -u php4/ext/dbx/dbx_mssql.h:1.4 php4/ext/dbx/dbx_mssql.h:1.5 --- php4/ext/dbx/dbx_mssql.h:1.4 Tue Aug 7 15:09:58 2001 +++ php4/ext/dbx/dbx_mssql.h Fri Aug 17 09:00:46 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dbx_mssql.h,v 1.4 2001/08/07 19:09:58 fmk Exp $ */ +/* $Id: dbx_mssql.h,v 1.5 2001/08/17 13:00:46 andi Exp $ */ #ifndef ZEND_DBX_MSSQL_H #define ZEND_DBX_MSSQL_H @@ -31,23 +31,23 @@ #include "php.h" -int dbx_mssql_connect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS); +int dbx_mssql_connect(zval **rv, zval **host, zval **db, zval **username, zval **password, INTERNAL_FUNCTION_PARAMETERS); /* returns connection handle as resource on success or 0 as long on failure */ -int dbx_mssql_pconnect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS); +int dbx_mssql_pconnect(zval **rv, zval **host, zval **db, zval **username, zval **password, INTERNAL_FUNCTION_PARAMETERS); /* returns persistent connection handle as resource on success or 0 as long on failure */ -int dbx_mssql_close(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETERS); +int dbx_mssql_close(zval **rv, zval **dbx_handle, INTERNAL_FUNCTION_PARAMETERS); /* returns 1 as long on success or 0 as long on failure */ -int dbx_mssql_query(zval ** rv, zval ** dbx_handle, zval ** db_name, zval ** sql_statement, INTERNAL_FUNCTION_PARAMETERS); +int dbx_mssql_query(zval **rv, zval **dbx_handle, zval **db_name, zval **sql_statement, INTERNAL_FUNCTION_PARAMETERS); /* returns 1 as long or a result identifier as resource on success or 0 as long on failure */ -int dbx_mssql_getcolumncount(zval ** rv, zval ** result_handle, INTERNAL_FUNCTION_PARAMETERS); +int dbx_mssql_getcolumncount(zval **rv, zval **result_handle, INTERNAL_FUNCTION_PARAMETERS); /* returns column-count as long on success or 0 as long on failure */ -int dbx_mssql_getcolumnname(zval ** rv, zval ** result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS); +int dbx_mssql_getcolumnname(zval **rv, zval **result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS); /* returns column-name as string on success or 0 as long on failure */ -int dbx_mssql_getcolumntype(zval ** rv, zval ** result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS); +int dbx_mssql_getcolumntype(zval **rv, zval **result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS); /* returns column-type as string on success or 0 as long on failure */ -int dbx_mssql_getrow(zval ** rv, zval ** result_handle, long row_number, INTERNAL_FUNCTION_PARAMETERS); +int dbx_mssql_getrow(zval **rv, zval **result_handle, long row_number, INTERNAL_FUNCTION_PARAMETERS); /* returns array[0..columncount-1] as strings on success or 0 as long on failure */ -int dbx_mssql_error(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETERS); +int dbx_mssql_error(zval **rv, zval **dbx_handle, INTERNAL_FUNCTION_PARAMETERS); /* returns string */ #endif /* ZEND_DBX_MSSQL_H */ Index: php4/ext/dbx/dbx_mysql.c diff -u php4/ext/dbx/dbx_mysql.c:1.9 php4/ext/dbx/dbx_mysql.c:1.10 --- php4/ext/dbx/dbx_mysql.c:1.9 Tue Aug 7 15:09:58 2001 +++ php4/ext/dbx/dbx_mysql.c Fri Aug 17 09:00:46 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dbx_mysql.c,v 1.9 2001/08/07 19:09:58 fmk Exp $ */ +/* $Id: dbx_mysql.c,v 1.10 2001/08/17 13:00:46 andi Exp $ */ #include "dbx.h" #include "dbx_mysql.h" @@ -28,10 +28,10 @@ #define MYSQL_ASSOC 1<<0 #define MYSQL_NUM 1<<1 -int dbx_mysql_connect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_mysql_connect(zval **rv, zval **host, zval **db, zval **username, zval **password, INTERNAL_FUNCTION_PARAMETERS) { /* returns connection handle as resource on success or 0 as long on failure */ int number_of_arguments=3; - zval ** arguments[3]; + zval **arguments[3]; zval * returned_zval=NULL; zval * select_db_zval=NULL; @@ -66,10 +66,10 @@ return 1; } -int dbx_mysql_pconnect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_mysql_pconnect(zval **rv, zval **host, zval **db, zval **username, zval **password, INTERNAL_FUNCTION_PARAMETERS) { /* returns persistent connection handle as resource on success or 0 as long on failure */ int number_of_arguments=3; - zval ** arguments[3]; + zval **arguments[3]; zval * returned_zval=NULL; zval * select_db_zval=NULL; @@ -104,10 +104,10 @@ return 1; } -int dbx_mysql_close(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_mysql_close(zval **rv, zval **dbx_handle, INTERNAL_FUNCTION_PARAMETERS) { /* returns 1 as long on success or 0 as long on failure */ int number_of_arguments=1; - zval ** arguments[1]; + zval **arguments[1]; zval * returned_zval=NULL; arguments[0]=dbx_handle; @@ -120,10 +120,10 @@ return 1; } -int dbx_mysql_query(zval ** rv, zval ** dbx_handle, zval ** db_name, zval ** sql_statement, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_mysql_query(zval **rv, zval **dbx_handle, zval **db_name, zval **sql_statement, INTERNAL_FUNCTION_PARAMETERS) { /* returns 1 as long or a result identifier as resource on success or 0 as long on failure */ int number_of_arguments=3; - zval ** arguments[3]; + zval **arguments[3]; zval * returned_zval=NULL; arguments[0]=db_name; @@ -139,10 +139,10 @@ return 1; } -int dbx_mysql_getcolumncount(zval ** rv, zval ** result_handle, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_mysql_getcolumncount(zval **rv, zval **result_handle, INTERNAL_FUNCTION_PARAMETERS) { /* returns column-count as long on success or 0 as long on failure */ int number_of_arguments=1; - zval ** arguments[1]; + zval **arguments[1]; zval * returned_zval=NULL; arguments[0]=result_handle; @@ -155,10 +155,10 @@ return 1; } -int dbx_mysql_getcolumnname(zval ** rv, zval ** result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_mysql_getcolumnname(zval **rv, zval **result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS) { /* returns column-name as string on success or 0 as long on failure */ int number_of_arguments=2; - zval ** arguments[2]; + zval **arguments[2]; zval * zval_column_index; zval * returned_zval=NULL; @@ -178,10 +178,10 @@ return 1; } -int dbx_mysql_getcolumntype(zval ** rv, zval ** result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_mysql_getcolumntype(zval **rv, zval **result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS) { /* returns column-type as string on success or 0 as long on failure */ int number_of_arguments=2; - zval ** arguments[2]; + zval **arguments[2]; zval * zval_column_index; zval * returned_zval=NULL; @@ -202,10 +202,10 @@ return 1; } -int dbx_mysql_getrow(zval ** rv, zval ** result_handle, long row_number, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_mysql_getrow(zval **rv, zval **result_handle, long row_number, INTERNAL_FUNCTION_PARAMETERS) { /* returns array[0..columncount-1] as strings on success or 0 as long on failure */ int number_of_arguments=2; - zval ** arguments[2]; + zval **arguments[2]; zval * zval_resulttype=NULL; zval * returned_zval=NULL; @@ -224,10 +224,10 @@ return 1; } -int dbx_mysql_error(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_mysql_error(zval **rv, zval **dbx_handle, INTERNAL_FUNCTION_PARAMETERS) { /* returns string */ int number_of_arguments=1; - zval ** arguments[1]; + zval **arguments[1]; zval * returned_zval=NULL; arguments[0]=dbx_handle; Index: php4/ext/dbx/dbx_mysql.h diff -u php4/ext/dbx/dbx_mysql.h:1.8 php4/ext/dbx/dbx_mysql.h:1.9 --- php4/ext/dbx/dbx_mysql.h:1.8 Tue Aug 7 15:09:58 2001 +++ php4/ext/dbx/dbx_mysql.h Fri Aug 17 09:00:46 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dbx_mysql.h,v 1.8 2001/08/07 19:09:58 fmk Exp $ */ +/* $Id: dbx_mysql.h,v 1.9 2001/08/17 13:00:46 andi Exp $ */ #ifndef ZEND_DBX_MYSQL_H #define ZEND_DBX_MYSQL_H @@ -31,23 +31,23 @@ #include "php.h" -int dbx_mysql_connect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS); +int dbx_mysql_connect(zval **rv, zval **host, zval **db, zval **username, zval **password, INTERNAL_FUNCTION_PARAMETERS); /* returns connection handle as resource on success or 0 as long on failure */ -int dbx_mysql_pconnect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS); +int dbx_mysql_pconnect(zval **rv, zval **host, zval **db, zval **username, zval **password, INTERNAL_FUNCTION_PARAMETERS); /* returns persistent connection handle as resource on success or 0 as long on failure */ -int dbx_mysql_close(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETERS); +int dbx_mysql_close(zval **rv, zval **dbx_handle, INTERNAL_FUNCTION_PARAMETERS); /* returns 1 as long on success or 0 as long on failure */ -int dbx_mysql_query(zval ** rv, zval ** dbx_handle, zval ** db_name, zval ** sql_statement, INTERNAL_FUNCTION_PARAMETERS); +int dbx_mysql_query(zval **rv, zval **dbx_handle, zval **db_name, zval **sql_statement, INTERNAL_FUNCTION_PARAMETERS); /* returns 1 as long or a result identifier as resource on success or 0 as long on failure */ -int dbx_mysql_getcolumncount(zval ** rv, zval ** result_handle, INTERNAL_FUNCTION_PARAMETERS); +int dbx_mysql_getcolumncount(zval **rv, zval **result_handle, INTERNAL_FUNCTION_PARAMETERS); /* returns column-count as long on success or 0 as long on failure */ -int dbx_mysql_getcolumnname(zval ** rv, zval ** result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS); +int dbx_mysql_getcolumnname(zval **rv, zval **result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS); /* returns column-name as string on success or 0 as long on failure */ -int dbx_mysql_getcolumntype(zval ** rv, zval ** result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS); +int dbx_mysql_getcolumntype(zval **rv, zval **result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS); /* returns column-type as string on success or 0 as long on failure */ -int dbx_mysql_getrow(zval ** rv, zval ** result_handle, long row_number, INTERNAL_FUNCTION_PARAMETERS); +int dbx_mysql_getrow(zval **rv, zval **result_handle, long row_number, INTERNAL_FUNCTION_PARAMETERS); /* returns array[0..columncount-1] as strings on success or 0 as long on failure */ -int dbx_mysql_error(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETERS); +int dbx_mysql_error(zval **rv, zval **dbx_handle, INTERNAL_FUNCTION_PARAMETERS); /* returns string */ #endif /* ZEND_DBX_MYSQL_H */ Index: php4/ext/dbx/dbx_oci8.c diff -u php4/ext/dbx/dbx_oci8.c:1.1 php4/ext/dbx/dbx_oci8.c:1.2 --- php4/ext/dbx/dbx_oci8.c:1.1 Fri Aug 17 08:54:23 2001 +++ php4/ext/dbx/dbx_oci8.c Fri Aug 17 09:00:46 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dbx_oci8.c,v 1.1 2001/08/17 12:54:23 mboeren Exp $ */ +/* $Id: dbx_oci8.c,v 1.2 2001/08/17 13:00:46 andi Exp $ */ #include "dbx.h" #include "dbx_oci8.h" @@ -30,10 +30,10 @@ #define OCI_RETURN_NULLS 1<<2 #define OCI_RETURN_LOBS 1<<3 -int dbx_oci8_connect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_oci8_connect(zval **rv, zval **host, zval **db, zval **username, zval **password, INTERNAL_FUNCTION_PARAMETERS) { /* returns connection handle as resource on success or 0 as long on failure */ int number_of_arguments=3; - zval ** arguments[3]; + zval **arguments[3]; zval * returned_zval=NULL; arguments[0]=username; @@ -48,10 +48,10 @@ return 1; } -int dbx_oci8_pconnect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_oci8_pconnect(zval **rv, zval **host, zval **db, zval **username, zval **password, INTERNAL_FUNCTION_PARAMETERS) { /* returns connection handle as resource on success or 0 as long on failure */ int number_of_arguments=3; - zval ** arguments[3]; + zval **arguments[3]; zval * returned_zval=NULL; arguments[0]=username; @@ -66,10 +66,10 @@ return 1; } -int dbx_oci8_close(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_oci8_close(zval **rv, zval **dbx_handle, INTERNAL_FUNCTION_PARAMETERS) { /* returns 1 as long on success or 0 as long on failure */ int number_of_arguments=1; - zval ** arguments[1]; + zval **arguments[1]; zval * returned_zval=NULL; arguments[0]=dbx_handle; @@ -82,10 +82,10 @@ return 1; } -int dbx_oci8_query(zval ** rv, zval ** dbx_handle, zval ** db_name, zval ** sql_statement, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_oci8_query(zval **rv, zval **dbx_handle, zval **db_name, zval **sql_statement, INTERNAL_FUNCTION_PARAMETERS) { /* returns 1 as long or a result identifier as resource on success or 0 as long on failure */ int number_of_arguments=2; - zval ** arguments[2]; + zval **arguments[2]; zval * returned_zval=NULL; zval * execute_zval=NULL; @@ -110,10 +110,10 @@ return 1; } -int dbx_oci8_getcolumncount(zval ** rv, zval ** result_handle, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_oci8_getcolumncount(zval **rv, zval **result_handle, INTERNAL_FUNCTION_PARAMETERS) { /* returns column-count as long on success or 0 as long on failure */ int number_of_arguments=1; - zval ** arguments[1]; + zval **arguments[1]; zval * returned_zval=NULL; arguments[0]=result_handle; @@ -126,10 +126,10 @@ return 1; } -int dbx_oci8_getcolumnname(zval ** rv, zval ** result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_oci8_getcolumnname(zval **rv, zval **result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS) { /* returns column-name as string on success or 0 as long on failure */ int number_of_arguments=2; - zval ** arguments[2]; + zval **arguments[2]; zval * zval_column_index; zval * returned_zval=NULL; @@ -150,10 +150,10 @@ return 1; } -int dbx_oci8_getcolumntype(zval ** rv, zval ** result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_oci8_getcolumntype(zval **rv, zval **result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS) { /* returns column-type as string on success or 0 as long on failure */ int number_of_arguments=2; - zval ** arguments[2]; + zval **arguments[2]; zval * zval_column_index; zval * returned_zval=NULL; @@ -175,10 +175,10 @@ return 1; } -int dbx_oci8_getrow(zval ** rv, zval ** result_handle, long row_number, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_oci8_getrow(zval **rv, zval **result_handle, long row_number, INTERNAL_FUNCTION_PARAMETERS) { /* returns array[0..columncount-1] as strings on success or 0 as long on failure */ int number_of_arguments=3; - zval ** arguments[3]; + zval **arguments[3]; zval * zval_resulttype=NULL; zval * zval_returned_array=NULL; zval * returned_zval=NULL; @@ -202,10 +202,10 @@ return 1; } -int dbx_oci8_error(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_oci8_error(zval **rv, zval **dbx_handle, INTERNAL_FUNCTION_PARAMETERS) { /* returns string */ int number_of_arguments=1; - zval ** arguments[1]; + zval **arguments[1]; zval * returned_zval=NULL; zval * returned_message_zval=NULL; arguments[0]=dbx_handle; Index: php4/ext/dbx/dbx_oci8.h diff -u php4/ext/dbx/dbx_oci8.h:1.1 php4/ext/dbx/dbx_oci8.h:1.2 --- php4/ext/dbx/dbx_oci8.h:1.1 Fri Aug 17 08:54:23 2001 +++ php4/ext/dbx/dbx_oci8.h Fri Aug 17 09:00:46 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dbx_oci8.h,v 1.1 2001/08/17 12:54:23 mboeren Exp $ */ +/* $Id: dbx_oci8.h,v 1.2 2001/08/17 13:00:46 andi Exp $ */ #ifndef ZEND_DBX_OCI8_H #define ZEND_DBX_OCI8_H @@ -31,23 +31,23 @@ #include "php.h" -int dbx_oci8_connect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS); +int dbx_oci8_connect(zval **rv, zval **host, zval **db, zval **username, zval **password, INTERNAL_FUNCTION_PARAMETERS); /* returns connection handle as resource on success or 0 as long on failure */ -int dbx_oci8_pconnect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS); +int dbx_oci8_pconnect(zval **rv, zval **host, zval **db, zval **username, zval **password, INTERNAL_FUNCTION_PARAMETERS); /* returns persistent connection handle as resource on success or 0 as long on failure */ -int dbx_oci8_close(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETERS); +int dbx_oci8_close(zval **rv, zval **dbx_handle, INTERNAL_FUNCTION_PARAMETERS); /* returns 1 as long on success or 0 as long on failure */ -int dbx_oci8_query(zval ** rv, zval ** dbx_handle, zval ** db_name, zval ** sql_statement, INTERNAL_FUNCTION_PARAMETERS); +int dbx_oci8_query(zval **rv, zval **dbx_handle, zval **db_name, zval **sql_statement, INTERNAL_FUNCTION_PARAMETERS); /* returns 1 as long or a result identifier as resource on success or 0 as long on failure */ -int dbx_oci8_getcolumncount(zval ** rv, zval ** result_handle, INTERNAL_FUNCTION_PARAMETERS); +int dbx_oci8_getcolumncount(zval **rv, zval **result_handle, INTERNAL_FUNCTION_PARAMETERS); /* returns column-count as long on success or 0 as long on failure */ -int dbx_oci8_getcolumnname(zval ** rv, zval ** result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS); +int dbx_oci8_getcolumnname(zval **rv, zval **result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS); /* returns column-name as string on success or 0 as long on failure */ -int dbx_oci8_getcolumntype(zval ** rv, zval ** result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS); +int dbx_oci8_getcolumntype(zval **rv, zval **result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS); /* returns column-type as string on success or 0 as long on failure */ -int dbx_oci8_getrow(zval ** rv, zval ** result_handle, long row_number, INTERNAL_FUNCTION_PARAMETERS); +int dbx_oci8_getrow(zval **rv, zval **result_handle, long row_number, INTERNAL_FUNCTION_PARAMETERS); /* returns array[0..columncount-1] as strings on success or 0 as long on failure */ -int dbx_oci8_error(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETERS); +int dbx_oci8_error(zval **rv, zval **dbx_handle, INTERNAL_FUNCTION_PARAMETERS); /* returns string */ #endif /* ZEND_DBX_OCI8_H */ Index: php4/ext/dbx/dbx_odbc.c diff -u php4/ext/dbx/dbx_odbc.c:1.11 php4/ext/dbx/dbx_odbc.c:1.12 --- php4/ext/dbx/dbx_odbc.c:1.11 Tue Aug 7 15:09:58 2001 +++ php4/ext/dbx/dbx_odbc.c Fri Aug 17 09:00:46 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dbx_odbc.c,v 1.11 2001/08/07 19:09:58 fmk Exp $ */ +/* $Id: dbx_odbc.c,v 1.12 2001/08/17 13:00:46 andi Exp $ */ #include "dbx.h" #include "dbx_odbc.h" @@ -28,10 +28,10 @@ #define ODBC_ASSOC 1 #define ODBC_NUM 2 -int dbx_odbc_connect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_odbc_connect(zval **rv, zval **host, zval **db, zval **username, zval **password, INTERNAL_FUNCTION_PARAMETERS) { /* returns connection handle as resource on success or 0 as long on failure */ int number_of_arguments=3; - zval ** arguments[3]; + zval **arguments[3]; zval * returned_zval=NULL; arguments[0]=db; @@ -46,10 +46,10 @@ return 1; } -int dbx_odbc_pconnect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_odbc_pconnect(zval **rv, zval **host, zval **db, zval **username, zval **password, INTERNAL_FUNCTION_PARAMETERS) { /* returns connection handle as resource on success or 0 as long on failure */ int number_of_arguments=3; - zval ** arguments[3]; + zval **arguments[3]; zval * returned_zval=NULL; arguments[0]=db; @@ -64,10 +64,10 @@ return 1; } -int dbx_odbc_close(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_odbc_close(zval **rv, zval **dbx_handle, INTERNAL_FUNCTION_PARAMETERS) { /* returns 1 as long on success or 0 as long on failure */ int number_of_arguments=1; - zval ** arguments[1]; + zval **arguments[1]; zval * returned_zval=NULL; int exit_status=EG(exit_status); @@ -91,10 +91,10 @@ return 1; } -int dbx_odbc_query(zval ** rv, zval ** dbx_handle, zval ** db_name, zval ** sql_statement, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_odbc_query(zval **rv, zval **dbx_handle, zval **db_name, zval **sql_statement, INTERNAL_FUNCTION_PARAMETERS) { /* returns 1 as long or a result identifier as resource on success or 0 as long on failure */ int number_of_arguments=2; - zval ** arguments[2]; + zval **arguments[2]; zval * queryresult_zval=NULL; zval * num_fields_zval=NULL; @@ -126,10 +126,10 @@ return 1; } -int dbx_odbc_getcolumncount(zval ** rv, zval ** result_handle, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_odbc_getcolumncount(zval **rv, zval **result_handle, INTERNAL_FUNCTION_PARAMETERS) { /* returns column-count as long on success or 0 as long on failure */ int number_of_arguments=1; - zval ** arguments[1]; + zval **arguments[1]; zval * returned_zval=NULL; arguments[0]=result_handle; @@ -142,10 +142,10 @@ return 1; } -int dbx_odbc_getcolumnname(zval ** rv, zval ** result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_odbc_getcolumnname(zval **rv, zval **result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS) { /* returns column-name as string on success or 0 as long on failure */ int number_of_arguments=2; - zval ** arguments[2]; + zval **arguments[2]; zval * zval_column_index; zval * returned_zval=NULL; @@ -165,10 +165,10 @@ return 1; } -int dbx_odbc_getcolumntype(zval ** rv, zval ** result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_odbc_getcolumntype(zval **rv, zval **result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS) { /* returns column-type as string on success or 0 as long on failure */ int number_of_arguments=2; - zval ** arguments[2]; + zval **arguments[2]; zval * zval_column_index; zval * returned_zval=NULL; @@ -189,10 +189,10 @@ return 1; } -int dbx_odbc_getrow(zval ** rv, zval ** result_handle, long row_number, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_odbc_getrow(zval **rv, zval **result_handle, long row_number, INTERNAL_FUNCTION_PARAMETERS) { /* returns array[0..columncount-1] as strings on success or 0 as long on failure */ int number_of_arguments; - zval ** arguments[2]; + zval **arguments[2]; zval * num_fields_zval=NULL; zval * fetch_row_result_zval=NULL; zval * field_result_zval=NULL; @@ -247,10 +247,10 @@ return 1; } -int dbx_odbc_error(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_odbc_error(zval **rv, zval **dbx_handle, INTERNAL_FUNCTION_PARAMETERS) { /* returns string */ int number_of_arguments=1; - zval ** arguments[1]; + zval **arguments[1]; zval * returned_zval=NULL; arguments[0]=dbx_handle; Index: php4/ext/dbx/dbx_odbc.h diff -u php4/ext/dbx/dbx_odbc.h:1.8 php4/ext/dbx/dbx_odbc.h:1.9 --- php4/ext/dbx/dbx_odbc.h:1.8 Tue Aug 7 15:09:58 2001 +++ php4/ext/dbx/dbx_odbc.h Fri Aug 17 09:00:46 2001 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dbx_odbc.h,v 1.8 2001/08/07 19:09:58 fmk Exp $ */ +/* $Id: dbx_odbc.h,v 1.9 2001/08/17 13:00:46 andi Exp $ */ #ifndef ZEND_DBX_ODBC_H #define ZEND_DBX_ODBC_H @@ -31,23 +31,23 @@ #include "php.h" -int dbx_odbc_connect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS); +int dbx_odbc_connect(zval **rv, zval **host, zval **db, zval **username, zval **password, INTERNAL_FUNCTION_PARAMETERS); /* returns connection handle as resource on success or 0 as long on failure */ -int dbx_odbc_pconnect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS); +int dbx_odbc_pconnect(zval **rv, zval **host, zval **db, zval **username, zval **password, INTERNAL_FUNCTION_PARAMETERS); /* returns persisten connection handle as resource on success or 0 as long on failure */ -int dbx_odbc_close(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETERS); +int dbx_odbc_close(zval **rv, zval **dbx_handle, INTERNAL_FUNCTION_PARAMETERS); /* returns 1 as long on success or 0 as long on failure */ -int dbx_odbc_query(zval ** rv, zval ** dbx_handle, zval ** db_name, zval ** sql_statement, INTERNAL_FUNCTION_PARAMETERS); +int dbx_odbc_query(zval **rv, zval **dbx_handle, zval **db_name, zval **sql_statement, INTERNAL_FUNCTION_PARAMETERS); /* returns 1 as long or a result identifier as resource on success or 0 as long on failure */ -int dbx_odbc_getcolumncount(zval ** rv, zval ** result_handle, INTERNAL_FUNCTION_PARAMETERS); +int dbx_odbc_getcolumncount(zval **rv, zval **result_handle, INTERNAL_FUNCTION_PARAMETERS); /* returns column-count as long on success or 0 as long on failure */ -int dbx_odbc_getcolumnname(zval ** rv, zval ** result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS); +int dbx_odbc_getcolumnname(zval **rv, zval **result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS); /* returns column-name as string on success or 0 as long on failure */ -int dbx_odbc_getcolumntype(zval ** rv, zval ** result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS); +int dbx_odbc_getcolumntype(zval **rv, zval **result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS); /* returns column-type as string on success or 0 as long on failure */ -int dbx_odbc_getrow(zval ** rv, zval ** result_handle, long row_number, INTERNAL_FUNCTION_PARAMETERS); +int dbx_odbc_getrow(zval **rv, zval **result_handle, long row_number, INTERNAL_FUNCTION_PARAMETERS); /* returns array[0..columncount-1] as strings on success or 0 as long on failure */ -int dbx_odbc_error(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETERS); +int dbx_odbc_error(zval **rv, zval **dbx_handle, INTERNAL_FUNCTION_PARAMETERS); /* returns string */ #endif /* ZEND_DBX_ODBC_H */ Index: php4/ext/dbx/dbx_pgsql.c diff -u php4/ext/dbx/dbx_pgsql.c:1.11 php4/ext/dbx/dbx_pgsql.c:1.12 --- php4/ext/dbx/dbx_pgsql.c:1.11 Sat Aug 11 12:38:24 2001 +++ php4/ext/dbx/dbx_pgsql.c Fri Aug 17 09:00:46 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dbx_pgsql.c,v 1.11 2001/08/11 16:38:24 zeev Exp $ */ +/* $Id: dbx_pgsql.c,v 1.12 2001/08/17 13:00:46 andi Exp $ */ #include "dbx.h" #include "php_dbx.h" @@ -26,7 +26,7 @@ #define PGSQL_ASSOC 1<<0 #define PGSQL_NUM 1<<1 -int dbx_pgsql_connect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_pgsql_connect(zval **rv, zval **host, zval **db, zval **username, zval **password, INTERNAL_FUNCTION_PARAMETERS) { /* returns connection handle as resource on success or 0 as long on failure */ int nargs=5; char *port="5432", *connstring=NULL; @@ -71,7 +71,7 @@ return 1; } -int dbx_pgsql_pconnect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_pgsql_pconnect(zval **rv, zval **host, zval **db, zval **username, zval **password, INTERNAL_FUNCTION_PARAMETERS) { /* returns persistent connection handle as resource on success or 0 as long on failure */ int nargs=5; char *port="5432", *connstring=NULL; @@ -116,10 +116,10 @@ return 1; } -int dbx_pgsql_close(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_pgsql_close(zval **rv, zval **dbx_handle, INTERNAL_FUNCTION_PARAMETERS) { /* returns 1 as long on success or 0 as long on failure */ int number_of_arguments=1; - zval ** arguments[1]; + zval **arguments[1]; zval * returned_zval=NULL; arguments[0]=dbx_handle; @@ -132,7 +132,7 @@ return 1; } -int dbx_pgsql_query(zval ** rv, zval ** dbx_handle, zval ** db_name, zval ** sql_statement, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_pgsql_query(zval **rv, zval **dbx_handle, zval **db_name, zval **sql_statement, INTERNAL_FUNCTION_PARAMETERS) { /* returns 1 as long or a result identifier as resource on success or 0 as long on failure */ int nargs=2; @@ -154,10 +154,10 @@ return 1; } -int dbx_pgsql_getcolumncount(zval ** rv, zval ** result_handle, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_pgsql_getcolumncount(zval **rv, zval **result_handle, INTERNAL_FUNCTION_PARAMETERS) { /* returns column-count as long on success or 0 as long on failure */ int number_of_arguments=1; - zval ** arguments[1]; + zval **arguments[1]; zval * returned_zval=NULL; arguments[0]=result_handle; @@ -170,10 +170,10 @@ return 1; } -int dbx_pgsql_getcolumnname(zval ** rv, zval ** result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_pgsql_getcolumnname(zval **rv, zval **result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS) { /* returns column-name as string on success or 0 as long on failure */ int number_of_arguments=2; - zval ** arguments[2]; + zval **arguments[2]; zval * zval_column_index; zval * returned_zval=NULL; @@ -193,10 +193,10 @@ return 1; } -int dbx_pgsql_getcolumntype(zval ** rv, zval ** result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_pgsql_getcolumntype(zval **rv, zval **result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS) { /* returns column-type as string on success or 0 as long on failure */ int number_of_arguments=2; - zval ** arguments[2]; + zval **arguments[2]; zval * zval_column_index; zval * returned_zval=NULL; @@ -217,11 +217,11 @@ return 1; } -int dbx_pgsql_getrow(zval ** rv, zval ** result_handle, long row_number, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_pgsql_getrow(zval **rv, zval **result_handle, long row_number, INTERNAL_FUNCTION_PARAMETERS) { /* returns array[0..columncount-1] as strings on success or 0 as long on failure */ int number_of_arguments=2; int save_error_reporting=0; - zval ** arguments[2]; + zval **arguments[2]; zval * zval_row=NULL; zval * returned_zval=NULL; @@ -248,10 +248,10 @@ return 1; } -int dbx_pgsql_error(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_pgsql_error(zval **rv, zval **dbx_handle, INTERNAL_FUNCTION_PARAMETERS) { /* returns string */ int number_of_arguments=1; - zval ** arguments[1]; + zval **arguments[1]; zval * returned_zval=NULL; arguments[0]=dbx_handle; Index: php4/ext/dbx/dbx_pgsql.h diff -u php4/ext/dbx/dbx_pgsql.h:1.7 php4/ext/dbx/dbx_pgsql.h:1.8 --- php4/ext/dbx/dbx_pgsql.h:1.7 Tue Aug 7 15:09:58 2001 +++ php4/ext/dbx/dbx_pgsql.h Fri Aug 17 09:00:46 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dbx_pgsql.h,v 1.7 2001/08/07 19:09:58 fmk Exp $ */ +/* $Id: dbx_pgsql.h,v 1.8 2001/08/17 13:00:46 andi Exp $ */ #ifndef ZEND_DBX_PGSQL_H #define ZEND_DBX_PGSQL_H @@ -27,23 +27,23 @@ #include "php.h" -int dbx_pgsql_connect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS); +int dbx_pgsql_connect(zval **rv, zval **host, zval **db, zval **username, zval **password, INTERNAL_FUNCTION_PARAMETERS); /* returns connection handle as resource on success or 0 as long on failure */ -int dbx_pgsql_pconnect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS); +int dbx_pgsql_pconnect(zval **rv, zval **host, zval **db, zval **username, zval **password, INTERNAL_FUNCTION_PARAMETERS); /* returns persistent connection handle as resource on success or 0 as long on failure */ -int dbx_pgsql_close(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETERS); +int dbx_pgsql_close(zval **rv, zval **dbx_handle, INTERNAL_FUNCTION_PARAMETERS); /* returns 1 as long on success or 0 as long on failure */ -int dbx_pgsql_query(zval ** rv, zval ** dbx_handle, zval ** db_name, zval ** sql_statement, INTERNAL_FUNCTION_PARAMETERS); +int dbx_pgsql_query(zval **rv, zval **dbx_handle, zval **db_name, zval **sql_statement, INTERNAL_FUNCTION_PARAMETERS); /* returns 1 as long or a result identifier as resource on success or 0 as long on failure */ -int dbx_pgsql_getcolumncount(zval ** rv, zval ** result_handle, INTERNAL_FUNCTION_PARAMETERS); +int dbx_pgsql_getcolumncount(zval **rv, zval **result_handle, INTERNAL_FUNCTION_PARAMETERS); /* returns column-count as long on success or 0 as long on failure */ -int dbx_pgsql_getcolumnname(zval ** rv, zval ** result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS); +int dbx_pgsql_getcolumnname(zval **rv, zval **result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS); /* returns column-name as string on success or 0 as long on failure */ -int dbx_pgsql_getcolumntype(zval ** rv, zval ** result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS); +int dbx_pgsql_getcolumntype(zval **rv, zval **result_handle, long column_index, INTERNAL_FUNCTION_PARAMETERS); /* returns column-type as string on success or 0 as long on failure */ -int dbx_pgsql_getrow(zval ** rv, zval ** result_handle, long row_number, INTERNAL_FUNCTION_PARAMETERS); +int dbx_pgsql_getrow(zval **rv, zval **result_handle, long row_number, INTERNAL_FUNCTION_PARAMETERS); /* returns array[0..columncount-1] as strings on success or 0 as long on failure */ -int dbx_pgsql_error(zval ** rv, zval ** dbx_handle, INTERNAL_FUNCTION_PARAMETERS); +int dbx_pgsql_error(zval **rv, zval **dbx_handle, INTERNAL_FUNCTION_PARAMETERS); /* returns string */ #endif /* ZEND_DBX_PGSQL_H */ Index: php4/ext/dbx/howto_extend_dbx.html diff -u php4/ext/dbx/howto_extend_dbx.html:1.1 php4/ext/dbx/howto_extend_dbx.html:1.2 --- php4/ext/dbx/howto_extend_dbx.html:1.1 Fri May 4 05:39:52 2001 +++ php4/ext/dbx/howto_extend_dbx.html Fri Aug 17 09:00:46 2001 @@ -135,7 +135,7 @@ </pre> Finally, for the implementation of all switch_dbx_XXXXX functions, copy a 'case'-line for every function that you support (should be all functions!). Here is an example for only the switch_dbx_connect function:<br> <pre class="code"> -int switch_dbx_connect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS, zval ** dbx_module) { +int switch_dbx_connect(zval **rv, zval **host, zval **db, zval **username, zval **password, INTERNAL_FUNCTION_PARAMETERS, zval **dbx_module) { // returns connection handle as resource on success or 0 as long on failure switch ((*dbx_module)->value.lval) { case DBX_MYSQL: return dbx_mysql_connect(rv, host, db, username, password, INTERNAL_FUNCTION_PARAM_PASSTHRU); @@ -177,11 +177,11 @@ <p> The details of what each of the functions do, what parameters they get, and what parameters they should return are discussed below. But first, the dbx_mysql_connect function is presented and explained, so you get an idea of how things work.<br> <pre class="code"> -int dbx_mysql_connect(zval ** rv, zval ** host, zval ** db, zval ** username, zval ** password, INTERNAL_FUNCTION_PARAMETERS) { +int dbx_mysql_connect(zval **rv, zval **host, zval **db, zval **username, zval **password, INTERNAL_FUNCTION_PARAMETERS) { // returns connection handle as resource on success or 0 as long on // failure int number_of_arguments; - zval ** arguments[3]; + zval **arguments[3]; zval * returned_zval=NULL; zval * select_db_zval=NULL; @@ -208,11 +208,11 @@ First of all, all functions return 0 on failure and 1 on success. These values are used in the dbx-routines, they are never actually given back to the PHP-script writer that calls the dbx_connect function.<br> The actual value that is of interest to the caller is returned in the <span class="bold">rv</span> parameter. In this case it is a connection handle (or link identifier, in mysql-speak), that is also returned if the database selection doesn't succeed. <br> The parameters that are of interest to the function are located between the <span class="bold">rv</span> and <span class="bold">INTERNAL_FUNCTION_PARAMETERS</span> parameters, in this case it is a <span class="bold">host</span> name, a <span class="bold">db</span> name, a <span class="bold">username</span> and a <span class="bold">password</span>. These are the values that the user specifies if he calls dbx_connect(); These parameters are used in the calls to the mysql-database functions. The user actually also specifies a module-name, that decides which connect-function should be called. Here, he specified 'mysql'.<br> -To actually call a mysql module function, you can use <span class="bold">dbx_call_any_function</span> where you specify the function name (it is used twice in dbx_mysql_connect, see <span class="bold">'mysql_connect'</span> and <span class="bold">'mysql_select_db'</span>, they are printed bold in the code). The value that is returned from the function will be stored in the next argument, a zval * (e.g. <span class="bold">returned_zval</span>) parameter that you must declare locally. To actually return such a parameter, use the <span class="bold">MOVE_RETURNED_TO_RV(rv, returned_zval)</span> macro, which copies the values to <span class="bold">rv</span> and frees anything that may be left in <span class="bold">returned_zval</span>. Parameters that must be passed to the mysql-function are stored in the <span class="bold">arguments</span> array, which must be large enough to hold all parameters to the function-call that requires the most parameters (in this case, mysql_connect expects 3 parameters, mysql_select_db expects two parameters, so the <span class="bold">arguments</span> array is defined 'zval ** arguments[<span class="bold">3</span>]'). The <span class="bold">number_of_arguments</span> parameter is set to the actual number of arguments that the function-call requires. As you can see it is initialized to 3, for the first call to mysql_connect. Then it is set to 2, for the call to mysql_select_db. If you call a function that retrieves a value, and you don't return it with MOVE_RETURNED_TO_RV, then you must free the value using <span class="bold">zval_ptr_dtor</span>, as can be seen right after the call to mysql_select_db. This can also be seen directly after the call to mysql_connect, if somehow this function failed or didn't return a resource (on a successful connect mysql_connect returns a resource) the returned value is freed as well (and 0 is returned because the connection failed).<br> +To actually call a mysql module function, you can use <span class="bold">dbx_call_any_function</span> where you specify the function name (it is used twice in dbx_mysql_connect, see <span class="bold">'mysql_connect'</span> and <span class="bold">'mysql_select_db'</span>, they are printed bold in the code). The value that is returned from the function will be stored in the next argument, a zval * (e.g. <span class="bold">returned_zval</span>) parameter that you must declare locally. To actually return such a parameter, use the <span class="bold">MOVE_RETURNED_TO_RV(rv, returned_zval)</span> macro, which copies the values to <span class="bold">rv</span> and frees anything that may be left in <span class="bold">returned_zval</span>. Parameters that must be passed to the mysql-function are stored in the <span class="bold">arguments</span> array, which must be large enough to hold all parameters to the function-call that requires the most parameters (in this case, mysql_connect expects 3 parameters, mysql_select_db expects two parameters, so the <span class="bold">arguments</span> array is defined 'zval **arguments[<span class="bold">3</span>]'). The <span class="bold">number_of_arguments</span> parameter is set to the actual number of arguments that the function-call requires. As you can see it is initialized to 3, for the first call to mysql_connect. Then it is set to 2, for the call to mysql_select_db. If you call a function that retrieves a value, and you don't return it with MOVE_RETURNED_TO_RV, then you must free the value using <span class="bold">zval_ptr_dtor</span>, as can be seen right after the call to mysql_select_db. This can also be seen directly after the call to mysql_connect, if somehow this function failed or didn't return a resource (on a successful connect mysql_connect returns a resource) the returned value is freed as well (and 0 is returned because the connection failed).<br> <p> OK, now the description of all functions that you should implement, and what is expected of them...<br> <a name="connect"></a><pre class="code"> -int <span class="fn-name">dbx_blabla_connect</span>(zval ** rv, zval ** <span class="fn-param">host</span>, zval ** <span class="fn-param">db</span>, zval ** <span class="fn-param">username</span>, zval ** <span class="fn-param">password</span>, INTERNAL_FUNCTION_PARAMETERS); +int <span class="fn-name">dbx_blabla_connect</span>(zval **rv, zval **<span class="fn-param">host</span>, zval **<span class="fn-param">db</span>, zval **<span class="fn-param">username</span>, zval **<span class="fn-param">password</span>, INTERNAL_FUNCTION_PARAMETERS); // int: returns 0 on connect-failure and 1 on success // rv: connection handle as resource on success or nothing on failure </pre> @@ -223,14 +223,14 @@ The db (string) is the name of the database to select, or, for e.g. ODBC, the identifier that is needed to actually select the database.<br> The username (string) and password (string) are used for authentication.<br> <a name="pconnect"></a><pre class="code"> -int <span class="fn-name">dbx_blabla_pconnect</span>(zval ** rv, zval ** <span class="fn-param">host</span>, zval ** <span class="fn-param">db</span>, zval ** <span class="fn-param">username</span>, zval ** <span class="fn-param">password</span>, INTERNAL_FUNCTION_PARAMETERS); +int <span class="fn-name">dbx_blabla_pconnect</span>(zval **rv, zval **<span class="fn-param">host</span>, zval **<span class="fn-param">db</span>, zval **<span class="fn-param">username</span>, zval **<span class="fn-param">password</span>, INTERNAL_FUNCTION_PARAMETERS); // int: returns 0 on pconnect-failure and 1 on success // rv: persistent connection handle as resource on success or nothing // on failure </pre> dbx_blabla_pconnect is identical to dbx_blabla_connect except that it will create a persistent connection.<br> <a name="close"></a><pre class="code"> -int <span class="fn-name">dbx_blabla_close</span>(zval ** rv, zval ** <span class="fn-param">dbx_handle</span>, INTERNAL_FUNCTION_PARAMETERS); +int <span class="fn-name">dbx_blabla_close</span>(zval **rv, zval **<span class="fn-param">dbx_handle</span>, INTERNAL_FUNCTION_PARAMETERS); // int: returns 0 on close-failure and 1 on success // rv: 1 as bool on success or nothing on failure </pre> @@ -239,7 +239,7 @@ What must be returned from the function is a 1 on success and a 0 on failure. Note that an unsuccessful close is still a succeeded function call.<br> The dbx_handle is the same value that you returned from dbx_blabla_connect or dbx_blabla_pconnect.<br> <a name="query"></a><pre class="code"> -int <span class="fn-name">dbx_blabla_query</span>(zval ** rv, zval ** <span class="fn-param">dbx_handle</span>, zval ** <span class="fn-param">sql_statement</span>, INTERNAL_FUNCTION_PARAMETERS); +int <span class="fn-name">dbx_blabla_query</span>(zval **rv, zval **<span class="fn-param">dbx_handle</span>, zval **<span class="fn-param">sql_statement</span>, INTERNAL_FUNCTION_PARAMETERS); // int: returns 0 on query-failure and 1 on success // rv: 1 as bool or a result identifier as resource on success // or nothing on failure @@ -250,7 +250,7 @@ The dbx_handle is the same value that you returned from dbx_blabla_connect or dbx_blabla_pconnect.<br> The sql_statement (string) can have any value.<br> <a name="getcolumncount"></a><pre class="code"> -int <span class="fn-name">dbx_blabla_getcolumncount</span>(zval ** rv, zval ** <span class="fn-param">result_handle</span>, INTERNAL_FUNCTION_PARAMETERS); +int <span class="fn-name">dbx_blabla_getcolumncount</span>(zval **rv, zval **<span class="fn-param">result_handle</span>, INTERNAL_FUNCTION_PARAMETERS); // int: returns 0 on query-failure and 1 on success // returns column-count as long on success or nothing on failure </pre> @@ -259,7 +259,7 @@ What must be returned from the function is a 1 on success and a 0 on failure. <br> The result_handle is the same value that you returned from dbx_query.<br> <a name="getcolumnname"></a><pre class="code"> -int <span class="fn-name">dbx_blabla_getcolumnname</span>(zval ** rv, zval ** <span class="fn-param">result_handle</span>, long <span class="fn-param">column_index</span>, INTERNAL_FUNCTION_PARAMETERS); +int <span class="fn-name">dbx_blabla_getcolumnname</span>(zval **rv, zval **<span class="fn-param">result_handle</span>, long <span class="fn-param">column_index</span>, INTERNAL_FUNCTION_PARAMETERS); // int: returns 0 on failure and 1 on success // returns column-name as string on success or nothing on failure </pre> @@ -269,7 +269,7 @@ The result_handle is the same value that you returned from dbx_query.<br> The column_index is a long that ranges from 0 to the value you returned from dbx_blabla_getcolumncount minus 1 [0..columncount-1].<br> <a name="getcolumntype"></a><pre class="code"> -int <span class="fn-name">dbx_blabla_getcolumntype</span>(zval ** rv, zval ** <span class="fn-param">result_handle</span>, long <span class="fn-param">column_index</span>, INTERNAL_FUNCTION_PARAMETERS); +int <span class="fn-name">dbx_blabla_getcolumntype</span>(zval **rv, zval **<span class="fn-param">result_handle</span>, long <span class="fn-param">column_index</span>, INTERNAL_FUNCTION_PARAMETERS); // int: returns 0 on failure and 1 on success // returns column-type as string on success or nothing on failure </pre> @@ -279,7 +279,7 @@ The result_handle is the same value that you returned from dbx_query.<br> The column_index is a long that ranges from 0 to the value you returned from dbx_blabla_getcolumncount minus 1 [0..columncount-1].<br> <a name="getrow"></a><pre class="code"> -int <span class="fn-name">dbx_blabla_getrow</span>(zval ** rv, zval ** <span class="fn-param">result_handle</span>, long <span class="fn-param">row_number</span>, INTERNAL_FUNCTION_PARAMETERS); +int <span class="fn-name">dbx_blabla_getrow</span>(zval **rv, zval **<span class="fn-param">result_handle</span>, long <span class="fn-param">row_number</span>, INTERNAL_FUNCTION_PARAMETERS); // int: returns 0 on failure and 1 on success // returns array[0..columncount-1] as strings on success or 0 as long // on failure @@ -290,7 +290,7 @@ What must be returned from the function is a 1 on success and a 0 on failure (function failed or there are no more rows available). <br> The result_handle is the same value that you returned from dbx_query.<br> <a name="error"></a><pre class="code"> -int <span class="fn-name">dbx_blabla_error</span>(zval ** rv, zval ** <span class="fn-param">dbx_handle</span>, INTERNAL_FUNCTION_PARAMETERS); +int <span class="fn-name">dbx_blabla_error</span>(zval **rv, zval **<span class="fn-param">dbx_handle</span>, INTERNAL_FUNCTION_PARAMETERS); // int: returns 0 on failure and 1 on success // returns error message as string </pre>