[PHP4BETA] CVS update: php4/ext/odbc
| From: | sas | Date: | Fri, 21 May 1999 10:06:13 +0000 |
| Subject: | [PHP4BETA] CVS update: php4/ext/odbc | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-954@lists.php.net to get a copy of this message | ||
Date: Friday May 21, 1999 @ 6:06
Author: sas
Update of /repository/php4/ext/odbc
In directory php:/tmp/cvs-serv14196/ext/odbc
Modified Files:
odbc.c php3_odbc.h php3_velocis.h velocis.c
Log Message:
- run ext sources through conv_proto
- add necessary phpext_*_ptr
Index: php4/ext/odbc/odbc.c
diff -u php4/ext/odbc/odbc.c:1.8 php4/ext/odbc/odbc.c:1.9
--- php4/ext/odbc/odbc.c:1.8 Mon May 10 20:01:43 1999
+++ php4/ext/odbc/odbc.c Fri May 21 06:06:11 1999
@@ -29,7 +29,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: odbc.c,v 1.8 1999/05/11 00:01:43 zeev Exp $ */
+/* $Id: odbc.c,v 1.9 1999/05/21 10:06:11 sas Exp $ */
/* This file is based on the Adabas D extension.
* Adabas D will no longer be supported as separate module.
@@ -592,7 +592,7 @@
*/
/* {{{ proto odbc_execute(int result_id [, array parameters_array])
Execute a prepared statement */
-extern PHP_FUNCTION(odbc_execute)
+PHP_FUNCTION(odbc_execute)
{
pval *arg1, *arg2, arr, *tmp;
typedef struct params_t {
@@ -1074,7 +1074,7 @@
/* }}} */
#if HAVE_SOLID
-void php3_solid_fetch_prev(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(solid_fetch_prev)
{
int res_ind;
odbc_result *result;
Index: php4/ext/odbc/php3_odbc.h
diff -u php4/ext/odbc/php3_odbc.h:1.3 php4/ext/odbc/php3_odbc.h:1.4
--- php4/ext/odbc/php3_odbc.h:1.3 Sun May 9 04:47:59 1999
+++ php4/ext/odbc/php3_odbc.h Fri May 21 06:06:13 1999
@@ -28,7 +28,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php3_odbc.h,v 1.3 1999/05/09 08:47:59 zeev Exp $ */
+/* $Id: php3_odbc.h,v 1.4 1999/05/21 10:06:13 sas Exp $ */
#ifndef _PHP_ODBC_H
# define _PHP_ODBC_H
@@ -46,7 +46,7 @@
# include <cli0core.h>
# include <cli0ext1.h>
# define HAVE_SQL_EXTENDED_FETCH 0
-extern void php3_solid_fetch_prev(INTERNAL_FUNCTION_PARAMETERS);
+PHP_FUNCTION(solid_fetch_prev);
# elif HAVE_EMPRESS /* Empress */
@@ -120,35 +120,35 @@
extern int php3_minit_odbc(INIT_FUNC_ARGS);
extern int php3_mshutdown_odbc(SHUTDOWN_FUNC_ARGS);
extern int php3_rinit_odbc(INIT_FUNC_ARGS);
-extern void php3_info_odbc(ZEND_MODULE_INFO_FUNC_ARGS);
-extern PHP_FUNCTION(odbc_setoption);
-extern PHP_FUNCTION(odbc_autocommit);
-extern PHP_FUNCTION(odbc_close);
-extern PHP_FUNCTION(odbc_close_all);
-extern PHP_FUNCTION(odbc_commit);
-extern PHP_FUNCTION(odbc_connect);
-extern PHP_FUNCTION(odbc_pconnect);
-extern void php3_odbc_do_connect(INTERNAL_FUNCTION_PARAMETERS, int);
-extern PHP_FUNCTION(odbc_cursor);
-extern PHP_FUNCTION(odbc_exec);
-extern PHP_FUNCTION(odbc_do);
-extern PHP_FUNCTION(odbc_execute);
-extern PHP_FUNCTION(odbc_fetch_into);
-extern PHP_FUNCTION(odbc_fetch_row);
-extern PHP_FUNCTION(odbc_field_len);
-extern PHP_FUNCTION(odbc_field_name);
-extern PHP_FUNCTION(odbc_field_type);
-extern PHP_FUNCTION(odbc_field_num);
-extern PHP_FUNCTION(odbc_free_result);
-extern PHP_FUNCTION(odbc_num_fields);
-extern PHP_FUNCTION(odbc_num_rows);
-extern PHP_FUNCTION(odbc_prepare);
-extern PHP_FUNCTION(odbc_result);
-extern PHP_FUNCTION(odbc_result_all);
-extern PHP_FUNCTION(odbc_rollback);
-extern void php3_odbc_transact(INTERNAL_FUNCTION_PARAMETERS, int);
-extern PHP_FUNCTION(odbc_binmode);
-extern PHP_FUNCTION(odbc_longreadlen);
+void php3_info_odbc(ZEND_MODULE_INFO_FUNC_ARGS);
+PHP_FUNCTION(odbc_setoption);
+PHP_FUNCTION(odbc_autocommit);
+PHP_FUNCTION(odbc_close);
+PHP_FUNCTION(odbc_close_all);
+PHP_FUNCTION(odbc_commit);
+PHP_FUNCTION(odbc_connect);
+PHP_FUNCTION(odbc_pconnect);
+void php3_odbc_do_connect(INTERNAL_FUNCTION_PARAMETERS, int);
+PHP_FUNCTION(odbc_cursor);
+PHP_FUNCTION(odbc_exec);
+PHP_FUNCTION(odbc_do);
+PHP_FUNCTION(odbc_execute);
+PHP_FUNCTION(odbc_fetch_into);
+PHP_FUNCTION(odbc_fetch_row);
+PHP_FUNCTION(odbc_field_len);
+PHP_FUNCTION(odbc_field_name);
+PHP_FUNCTION(odbc_field_type);
+PHP_FUNCTION(odbc_field_num);
+PHP_FUNCTION(odbc_free_result);
+PHP_FUNCTION(odbc_num_fields);
+PHP_FUNCTION(odbc_num_rows);
+PHP_FUNCTION(odbc_prepare);
+PHP_FUNCTION(odbc_result);
+PHP_FUNCTION(odbc_result_all);
+PHP_FUNCTION(odbc_rollback);
+void php3_odbc_transact(INTERNAL_FUNCTION_PARAMETERS, int);
+PHP_FUNCTION(odbc_binmode);
+PHP_FUNCTION(odbc_longreadlen);
typedef struct odbc_connection {
#if HAVE_DB2
@@ -250,6 +250,8 @@
# define odbc_module_ptr NULL
#endif /* HAVE_UODBC */
+
+#define phpext_odbc_ptr odbc_module_ptr
#endif /* _PHP_ODBC_H */
Index: php4/ext/odbc/php3_velocis.h
diff -u php4/ext/odbc/php3_velocis.h:1.2 php4/ext/odbc/php3_velocis.h:1.3
--- php4/ext/odbc/php3_velocis.h:1.2 Sun May 9 04:47:59 1999
+++ php4/ext/odbc/php3_velocis.h Fri May 21 06:06:13 1999
@@ -28,7 +28,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php3_velocis.h,v 1.2 1999/05/09 08:47:59 zeev Exp $ */
+/* $Id: php3_velocis.h,v 1.3 1999/05/21 10:06:13 sas Exp $ */
#ifndef _PHP3_VELOCIS_H
#define _PHP3_VELOCIS_H
@@ -76,20 +76,20 @@
/* velocis.c functions */
extern int php3_minit_velocis(INIT_FUNC_ARGS);
extern int php3_rinit_velocis(INIT_FUNC_ARGS);
-extern void php3_info_velocis(ZEND_MODULE_INFO_FUNC_ARGS);
+void php3_info_velocis(ZEND_MODULE_INFO_FUNC_ARGS);
extern int php3_shutdown_velocis(SHUTDOWN_FUNC_ARGS);
-extern void php3_velocis_connect(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_velocis_close(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_velocis_exec(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_velocis_fetch(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_velocis_result(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_velocis_freeresult(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_velocis_autocommit(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_velocis_off_autocommit(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_velocis_commit(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_velocis_rollback(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_velocis_fieldnum(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_velocis_fieldname(INTERNAL_FUNCTION_PARAMETERS);
+PHP_FUNCTION(velocis_connect);
+PHP_FUNCTION(velocis_close);
+PHP_FUNCTION(velocis_exec);
+PHP_FUNCTION(velocis_fetch);
+PHP_FUNCTION(velocis_result);
+PHP_FUNCTION(velocis_freeresult);
+PHP_FUNCTION(velocis_autocommit);
+PHP_FUNCTION(velocis_off_autocommit);
+PHP_FUNCTION(velocis_commit);
+PHP_FUNCTION(velocis_rollback);
+PHP_FUNCTION(velocis_fieldnum);
+PHP_FUNCTION(velocis_fieldname);
extern velocis_module php3_velocis_module;
Index: php4/ext/odbc/velocis.c
diff -u php4/ext/odbc/velocis.c:1.2 php4/ext/odbc/velocis.c:1.3
--- php4/ext/odbc/velocis.c:1.2 Sun May 9 04:47:59 1999
+++ php4/ext/odbc/velocis.c Fri May 21 06:06:13 1999
@@ -28,7 +28,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: velocis.c,v 1.2 1999/05/09 08:47:59 zeev Exp $ */
+/* $Id: velocis.c,v 1.3 1999/05/21 10:06:13 sas Exp $ */
/*
* TODO:
@@ -188,7 +188,7 @@
/* Users functions */
-void php3_velocis_connect(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(velocis_connect)
{
pval *serv,*user,*pass;
char *Serv = NULL;
@@ -235,7 +235,7 @@
RETURN_LONG(ind);
}
-void php3_velocis_close(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(velocis_close)
{
pval *id;
VConn *conn;
@@ -256,7 +256,7 @@
RETURN_TRUE;
}
-void php3_velocis_exec(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(velocis_exec)
{
pval *ind,*exec_str;
char *query = NULL;
@@ -354,7 +354,7 @@
RETURN_LONG(indx);
}
-void php3_velocis_fetch(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(velocis_fetch)
{
pval *ind;
Vresult *res;
@@ -387,7 +387,7 @@
RETURN_TRUE;
}
-void php3_velocis_result(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(velocis_result)
{
pval *ind,*col;
Vresult *res;
@@ -484,7 +484,7 @@
}
}
-void php3_velocis_freeresult(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(velocis_freeresult)
{
pval *ind;
Vresult *res;
@@ -503,7 +503,7 @@
RETURN_TRUE;
}
-void php3_velocis_autocommit(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(velocis_autocommit)
{
pval *id;
RETCODE stat;
@@ -526,7 +526,7 @@
RETURN_TRUE;
}
-void php3_velocis_off_autocommit(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(velocis_off_autocommit)
{
pval *id;
RETCODE stat;
@@ -549,7 +549,7 @@
RETURN_TRUE;
}
-void php3_velocis_commit(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(velocis_commit)
{
pval *id;
RETCODE stat;
@@ -572,7 +572,7 @@
RETURN_TRUE;
}
-void php3_velocis_rollback(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(velocis_rollback)
{
pval *id;
RETCODE stat;
@@ -595,7 +595,7 @@
RETURN_TRUE;
}
-void php3_velocis_fieldname(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(velocis_fieldname)
{
pval *ind,*col;
Vresult *res;
@@ -619,7 +619,7 @@
RETURN_STRING(res->values[indx].name,TRUE);
}
-void php3_velocis_fieldnum(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(velocis_fieldnum)
{
pval *ind;
Vresult *res;
--
PHP 4 Beta