- run ext sources through conv_proto

- add necessary phpext_*_ptr

2 files changed, 25 insertions, 23 deletions

diff --git a/ext/interbase/interbase.c b/ext/interbase/interbase.c
index 9ad4507c79..8b9d402525 100644
--- a/ext/interbase/interbase.c
+++ b/ext/interbase/interbase.c
@@ -432,7 +432,7 @@ static void _php3_ibase_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
 
 /* {{{ proto int ibase_connect(string database [, string username] [, string password])
    Open a connection to an InterBase database */
-void php3_ibase_connect(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(ibase_connect)
 {
 	_php3_ibase_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
 }
@@ -440,7 +440,7 @@ void php3_ibase_connect(INTERNAL_FUNCTION_PARAMETERS)
 
 /* {{{ proto int ibase_pconnect(string database [, string username] [, string password])
    Open a persistent connection to an InterBase database */
-void php3_ibase_pconnect(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(ibase_pconnect)
 {
 	_php3_ibase_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
 }
@@ -448,7 +448,7 @@ void php3_ibase_pconnect(INTERNAL_FUNCTION_PARAMETERS)
 
 /* {{{ proto int ibase_close([int link_identifier])
    Close an InterBase connection */
-void php3_ibase_close(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(ibase_close)
 {
 	pval *ibase_link;
 	int id, type;
@@ -642,7 +642,7 @@ static XSQLDA *_php3_ibase_execute(isc_tr_handle tr_handle, isc_stmt_handle quer
 
 /* {{{ proto int ibase_query([int link_identifier, ]string query)
    Execute a query (without parameter placeholders). */
-void php3_ibase_query(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(ibase_query)
 {
 	pval *query, *ibase_link;
 	int id, type;
@@ -725,7 +725,7 @@ void php3_ibase_query(INTERNAL_FUNCTION_PARAMETERS)
 
 /* {{{ proto int ibase_fetch_row(int result)
    Fetch a row from the results of a query. */
-void php3_ibase_fetch_row(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(ibase_fetch_row)
 {
 	pval *result;
 	pval *pval_ptr;
@@ -886,7 +886,7 @@ void php3_ibase_fetch_row(INTERNAL_FUNCTION_PARAMETERS)
 
 /* {{{ proto int ibase_free_result(int result)
    Free the memory used by a result. */
-void php3_ibase_free_result(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(ibase_free_result)
 {
 	pval *result;
 	ibase_result_handle *ibase_result;
@@ -915,7 +915,7 @@ void php3_ibase_free_result(INTERNAL_FUNCTION_PARAMETERS)
 
 /* {{{ proto int ibase_prepare([int link_identifier, ]string query)
    Prepare a query for later binding of parameter placeholders and execution. */
-void php3_ibase_prepare(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(ibase_prepare)
 {
 	pval *query, *ibase_link;
 	int id, type;
@@ -974,7 +974,7 @@ void php3_ibase_prepare(INTERNAL_FUNCTION_PARAMETERS)
 
 /* {{{ proto int ibase_bind (int query)
    Bind parameter placeholders in a previously prepared query. Still nonfunctional. */
-void php3_ibase_bind(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(ibase_bind)
 {
 	pval *query;
 	ibase_query_handle *ibase_query;
@@ -1034,7 +1034,7 @@ void php3_ibase_bind(INTERNAL_FUNCTION_PARAMETERS)
 
 /* {{{ proto int ibase_execute(int query)
    Execute a previously prepared (and possibly binded) query. */
-void php3_ibase_execute(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(ibase_execute)
 {
 	pval *query;
 	ibase_query_handle *ibase_query;
@@ -1071,7 +1071,7 @@ void php3_ibase_execute(INTERNAL_FUNCTION_PARAMETERS)
 
 /* {{{ proto int ibase_free_query(int query)
    Free memory used by a query */
-void php3_ibase_free_query(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(ibase_free_query)
 {
 	pval *query;
 	ibase_query_handle *ibase_query;
@@ -1100,7 +1100,7 @@ void php3_ibase_free_query(INTERNAL_FUNCTION_PARAMETERS)
 
 /* {{{ proto int ibase_timefmt(string format)
    Sets the format of datetime columns returned from queries. Still nonfunctional. */
-void php3_ibase_timefmt(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(ibase_timefmt)
 {
 	pval *pmode;
 	IBASE_TLS_VARS;
diff --git a/ext/interbase/php3_interbase.h b/ext/interbase/php3_interbase.h
index ec2fe6ef80..9c5f20f848 100644
--- a/ext/interbase/php3_interbase.h
+++ b/ext/interbase/php3_interbase.h
@@ -47,18 +47,18 @@ extern php3_module_entry ibase_module_entry;
 extern int php3_minit_ibase(INIT_FUNC_ARGS);
 extern int php3_rinit_ibase(INIT_FUNC_ARGS);
 extern int php3_mfinish_ibase(void);
-extern void php3_info_ibase(ZEND_MODULE_INFO_FUNC_ARGS);
-extern void php3_ibase_connect(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_ibase_pconnect(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_ibase_close(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_ibase_query(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_ibase_fetch_row(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_ibase_free_result(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_ibase_prepare(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_ibase_bind(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_ibase_execute(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_ibase_free_query(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_ibase_timefmt(INTERNAL_FUNCTION_PARAMETERS);
+void php3_info_ibase(ZEND_MODULE_INFO_FUNC_ARGS);
+PHP_FUNCTION(ibase_connect);
+PHP_FUNCTION(ibase_pconnect);
+PHP_FUNCTION(ibase_close);
+PHP_FUNCTION(ibase_query);
+PHP_FUNCTION(ibase_fetch_row);
+PHP_FUNCTION(ibase_free_result);
+PHP_FUNCTION(ibase_prepare);
+PHP_FUNCTION(ibase_bind);
+PHP_FUNCTION(ibase_execute);
+PHP_FUNCTION(ibase_free_query);
+PHP_FUNCTION(ibase_timefmt);
 
 typedef struct {
 	long default_link;
@@ -98,6 +98,8 @@ extern ibase_module php3_ibase_module;
 
 #endif /* HAVE_IBASE */
 
+#define phpext_interbase_ptr php3_ibase_module_ptr
+
 #endif /* _PHP3_IBASE_H */
 
 /*