- run ext sources through conv_proto

- add necessary phpext_*_ptr

4 files changed, 91 insertions, 89 deletions

diff --git a/ext/sybase/php3_sybase-ct.h b/ext/sybase/php3_sybase-ct.h
index c8e89a6213..f02e7cf800 100644
--- a/ext/sybase/php3_sybase-ct.h
+++ b/ext/sybase/php3_sybase-ct.h
@@ -49,26 +49,26 @@ extern int php3_minit_sybct(INIT_FUNC_ARGS);
 extern int php3_rinit_sybct(INIT_FUNC_ARGS);
 extern int php3_mshutdown_sybct(SHUTDOWN_FUNC_ARGS);
 extern int php3_rshutdown_sybct(SHUTDOWN_FUNC_ARGS);
-extern void php3_info_sybct(ZEND_MODULE_INFO_FUNC_ARGS);
-extern void php3_sybct_connect(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_sybct_pconnect(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_sybct_close(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_sybct_select_db(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_sybct_query(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_sybct_free_result(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_sybct_get_last_message(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_sybct_num_rows(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_sybct_num_fields(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_sybct_fetch_row(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_sybct_fetch_array(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_sybct_fetch_object(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_sybct_data_seek(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_sybct_result(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_sybct_affected_rows(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_sybct_field_seek(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_sybct_min_client_severity(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_sybct_min_server_severity(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_sybct_fetch_field(INTERNAL_FUNCTION_PARAMETERS);
+void php3_info_sybct(ZEND_MODULE_INFO_FUNC_ARGS);
+PHP_FUNCTION(sybct_connect);
+PHP_FUNCTION(sybct_pconnect);
+PHP_FUNCTION(sybct_close);
+PHP_FUNCTION(sybct_select_db);
+PHP_FUNCTION(sybct_query);
+PHP_FUNCTION(sybct_free_result);
+PHP_FUNCTION(sybct_get_last_message);
+PHP_FUNCTION(sybct_num_rows);
+PHP_FUNCTION(sybct_num_fields);
+PHP_FUNCTION(sybct_fetch_row);
+PHP_FUNCTION(sybct_fetch_array);
+PHP_FUNCTION(sybct_fetch_object);
+PHP_FUNCTION(sybct_data_seek);
+PHP_FUNCTION(sybct_result);
+PHP_FUNCTION(sybct_affected_rows);
+PHP_FUNCTION(sybct_field_seek);
+PHP_FUNCTION(sybct_min_client_severity);
+PHP_FUNCTION(sybct_min_server_severity);
+PHP_FUNCTION(sybct_fetch_field);
 
 
 #include <ctpublic.h>
diff --git a/ext/sybase/php3_sybase.h b/ext/sybase/php3_sybase.h
index 3b1a5e18a1..9c175c8e88 100644
--- a/ext/sybase/php3_sybase.h
+++ b/ext/sybase/php3_sybase.h
@@ -47,36 +47,36 @@ extern int php3_minit_sybase(INIT_FUNC_ARGS);
 extern int php3_rinit_sybase(INIT_FUNC_ARGS);
 extern int php3_mshutdown_sybase(SHUTDOWN_FUNC_ARGS);
 extern int php3_rshutdown_sybase(SHUTDOWN_FUNC_ARGS);
-extern void php3_info_sybase(ZEND_MODULE_INFO_FUNC_ARGS);
-extern void php3_sybase_connect(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_sybase_pconnect(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_sybase_close(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_sybase_select_db(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_sybase_query(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_sybase_free_result(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_sybase_get_last_message(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_sybase_num_rows(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_sybase_num_fields(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_sybase_fetch_row(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_sybase_fetch_array(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_sybase_fetch_object(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_sybase_data_seek(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_sybase_result(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_sybase_field_seek(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_sybase_min_error_severity(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_sybase_min_message_severity(INTERNAL_FUNCTION_PARAMETERS);
-
-extern void php3_sybase_db_query(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_sybase_list_fields(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_sybase_fetch_lengths(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_sybase_fetch_field(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_sybase_field_seek(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_sybase_free_result(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_sybase_field_name(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_sybase_field_table(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_sybase_field_len(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_sybase_field_type(INTERNAL_FUNCTION_PARAMETERS);
-extern void php3_sybase_field_flags(INTERNAL_FUNCTION_PARAMETERS);
+void php3_info_sybase(ZEND_MODULE_INFO_FUNC_ARGS);
+PHP_FUNCTION(sybase_connect);
+PHP_FUNCTION(sybase_pconnect);
+PHP_FUNCTION(sybase_close);
+PHP_FUNCTION(sybase_select_db);
+PHP_FUNCTION(sybase_query);
+PHP_FUNCTION(sybase_free_result);
+PHP_FUNCTION(sybase_get_last_message);
+PHP_FUNCTION(sybase_num_rows);
+PHP_FUNCTION(sybase_num_fields);
+PHP_FUNCTION(sybase_fetch_row);
+PHP_FUNCTION(sybase_fetch_array);
+PHP_FUNCTION(sybase_fetch_object);
+PHP_FUNCTION(sybase_data_seek);
+PHP_FUNCTION(sybase_result);
+PHP_FUNCTION(sybase_field_seek);
+PHP_FUNCTION(sybase_min_error_severity);
+PHP_FUNCTION(sybase_min_message_severity);
+
+PHP_FUNCTION(sybase_db_query);
+PHP_FUNCTION(sybase_list_fields);
+PHP_FUNCTION(sybase_fetch_lengths);
+PHP_FUNCTION(sybase_fetch_field);
+PHP_FUNCTION(sybase_field_seek);
+PHP_FUNCTION(sybase_free_result);
+PHP_FUNCTION(sybase_field_name);
+PHP_FUNCTION(sybase_field_table);
+PHP_FUNCTION(sybase_field_len);
+PHP_FUNCTION(sybase_field_type);
+PHP_FUNCTION(sybase_field_flags);
 
 
 
@@ -138,4 +138,6 @@ extern sybase_module php3_sybase_module;
 
 #endif
 
+#define phpext_sybase_ptr sybase_module_ptr
+
 #endif /* _PHP3_SYBASE_H */
diff --git a/ext/sybase/sybase-ct.c b/ext/sybase/sybase-ct.c
index a07c1994ec..683b33354a 100644
--- a/ext/sybase/sybase-ct.c
+++ b/ext/sybase/sybase-ct.c
@@ -626,18 +626,18 @@ static int php3_sybct_get_default_link(INTERNAL_FUNCTION_PARAMETERS)
 }
 
 
-void php3_sybct_connect(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(sybct_connect)
 {
 	php3_sybct_do_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU,0);
 }
 
-void php3_sybct_pconnect(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(sybct_pconnect)
 {
 	php3_sybct_do_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU,1);
 }
 
 
-void php3_sybct_close(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(sybct_close)
 {
 	pval *sybct_link_index;
 	int id,type;
@@ -744,7 +744,7 @@ static int exec_cmd(sybct_link *sybct_ptr,char *cmdbuf)
 }
 
 
-void php3_sybct_select_db(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(sybct_select_db)
 {
 	pval *db,*sybct_link_index;
 	int id,type;
@@ -955,7 +955,7 @@ static sybct_result * _php3_sybct_fetch_result_set (sybct_link *sybct_ptr)
 }
 
 
-void php3_sybct_query(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(sybct_query)
 {
 	pval *query,*sybct_link_index;
 	int id,type;
@@ -1169,7 +1169,7 @@ void php3_sybct_query(INTERNAL_FUNCTION_PARAMETERS)
 }
 
 
-void php3_sybct_free_result(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(sybct_free_result)
 {
 	pval *sybct_result_index;
 	sybct_result *result;
@@ -1195,7 +1195,7 @@ void php3_sybct_free_result(INTERNAL_FUNCTION_PARAMETERS)
 
 
 #if 0
-void php3_sybct_get_last_message(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(sybct_get_last_message)
 {
 	if (php3_sybct_module.server_message) {
 		RETURN_STRING(php3_sybct_module.server_message,1);
@@ -1204,7 +1204,7 @@ void php3_sybct_get_last_message(INTERNAL_FUNCTION_PARAMETERS)
 #endif 
 
 
-void php3_sybct_num_rows(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(sybct_num_rows)
 {
 	pval *result_index;
 	int type,id;
@@ -1228,7 +1228,7 @@ void php3_sybct_num_rows(INTERNAL_FUNCTION_PARAMETERS)
 }
 
 
-void php3_sybct_num_fields(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(sybct_num_fields)
 {
 	pval *result_index;
 	int type,id;
@@ -1252,7 +1252,7 @@ void php3_sybct_num_fields(INTERNAL_FUNCTION_PARAMETERS)
 }
 
 
-void php3_sybct_fetch_row(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(sybct_fetch_row)
 {
 	pval *sybct_result_index;
 	int type,i,id;
@@ -1286,7 +1286,7 @@ void php3_sybct_fetch_row(INTERNAL_FUNCTION_PARAMETERS)
 }
 
 
-static void php3_sybct_fetch_hash(INTERNAL_FUNCTION_PARAMETERS)
+static PHP_FUNCTION(sybct_fetch_hash)
 {
 	pval *sybct_result_index;
 	sybct_result *result;
@@ -1328,7 +1328,7 @@ static void php3_sybct_fetch_hash(INTERNAL_FUNCTION_PARAMETERS)
 }
 
 
-void php3_sybct_fetch_object(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(sybct_fetch_object)
 {
 	php3_sybct_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU);
 	if (return_value->type==IS_ARRAY) {
@@ -1337,12 +1337,12 @@ void php3_sybct_fetch_object(INTERNAL_FUNCTION_PARAMETERS)
 }
 
 
-void php3_sybct_fetch_array(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(sybct_fetch_array)
 {
 	php3_sybct_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU);
 }
 
-void php3_sybct_data_seek(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(sybct_data_seek)
 {
 	pval *sybct_result_index,*offset;
 	int type,id;
@@ -1416,7 +1416,7 @@ static char *php3_sybct_get_field_name(CS_INT type)
 }
 
 
-void php3_sybct_fetch_field(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(sybct_fetch_field)
 {
 	pval *sybct_result_index,*offset;
 	int type,id,field_offset;
@@ -1473,7 +1473,7 @@ void php3_sybct_fetch_field(INTERNAL_FUNCTION_PARAMETERS)
 }
 
 
-void php3_sybct_field_seek(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(sybct_field_seek)
 {
 	pval *sybct_result_index,*offset;
 	int type,id,field_offset;
@@ -1505,7 +1505,7 @@ void php3_sybct_field_seek(INTERNAL_FUNCTION_PARAMETERS)
 }
 
 
-void php3_sybct_result(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(sybct_result)
 {
 	pval *row, *field, *sybct_result_index;
 	int id,type,field_offset=0;
@@ -1562,7 +1562,7 @@ void php3_sybct_result(INTERNAL_FUNCTION_PARAMETERS)
 }
 
 
-void php3_sybct_affected_rows(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(sybct_affected_rows)
 {
 	pval *sybct_link_index;
 	int id,type;
@@ -1625,7 +1625,7 @@ void php3_info_sybct(ZEND_MODULE_INFO_FUNC_ARGS)
 }
 
 
-void php3_sybct_min_client_severity(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(sybct_min_client_severity)
 {
 	pval *severity;
 	
@@ -1637,7 +1637,7 @@ void php3_sybct_min_client_severity(INTERNAL_FUNCTION_PARAMETERS)
 }
 
 
-void php3_sybct_min_server_severity(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(sybct_min_server_severity)
 {
 	pval *severity;
 	
diff --git a/ext/sybase/sybase.c b/ext/sybase/sybase.c
index f52790227f..222d938bee 100644
--- a/ext/sybase/sybase.c
+++ b/ext/sybase/sybase.c
@@ -494,18 +494,18 @@ static int php3_sybase_get_default_link(INTERNAL_FUNCTION_PARAMETERS)
 }
 
 
-void php3_sybase_connect(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(sybase_connect)
 {
 	php3_sybase_do_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU,0);
 }
 
-void php3_sybase_pconnect(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(sybase_pconnect)
 {
 	php3_sybase_do_connect(INTERNAL_FUNCTION_PARAM_PASSTHRU,1);
 }
 
 
-void php3_sybase_close(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(sybase_close)
 {
 	pval *sybase_link_index;
 	int id,type;
@@ -537,7 +537,7 @@ void php3_sybase_close(INTERNAL_FUNCTION_PARAMETERS)
 }
 	
 
-void php3_sybase_select_db(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(sybase_select_db)
 {
 	pval *db,*sybase_link_index;
 	int id,type;
@@ -659,7 +659,7 @@ static void php3_sybase_get_column_content(sybase_link *sybase_ptr,int offset,pv
 }
 
 
-void php3_sybase_query(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(sybase_query)
 {
 	pval *query,*sybase_link_index;
 	int id,type,retvalue;
@@ -796,7 +796,7 @@ void php3_sybase_query(INTERNAL_FUNCTION_PARAMETERS)
 }
 
                         
-void php3_sybase_free_result(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(sybase_free_result)
 {
 	pval *sybase_result_index;
 	sybase_result *result;
@@ -821,13 +821,13 @@ void php3_sybase_free_result(INTERNAL_FUNCTION_PARAMETERS)
 }
 
 
-void php3_sybase_get_last_message(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(sybase_get_last_message)
 {
 	RETURN_STRING(php3_sybase_module.server_message,1);
 }
 
 
-void php3_sybase_num_rows(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(sybase_num_rows)
 {
 	pval *result_index;
 	int type,id;
@@ -851,7 +851,7 @@ void php3_sybase_num_rows(INTERNAL_FUNCTION_PARAMETERS)
 }
 
 
-void php3_sybase_num_fields(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(sybase_num_fields)
 {
 	pval *result_index;
 	int type,id;
@@ -875,7 +875,7 @@ void php3_sybase_num_fields(INTERNAL_FUNCTION_PARAMETERS)
 }
 
 
-void php3_sybase_fetch_row(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(sybase_fetch_row)
 {
 	pval *sybase_result_index;
 	int type,i,id;
@@ -909,7 +909,7 @@ void php3_sybase_fetch_row(INTERNAL_FUNCTION_PARAMETERS)
 }
 
 
-static void php3_sybase_fetch_hash(INTERNAL_FUNCTION_PARAMETERS)
+static PHP_FUNCTION(sybase_fetch_hash)
 {
 	pval *sybase_result_index;
 	sybase_result *result;
@@ -950,7 +950,7 @@ static void php3_sybase_fetch_hash(INTERNAL_FUNCTION_PARAMETERS)
 }
 
 
-void php3_sybase_fetch_object(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(sybase_fetch_object)
 {
 	php3_sybase_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU);
 	if (return_value->type==IS_ARRAY) {
@@ -959,12 +959,12 @@ void php3_sybase_fetch_object(INTERNAL_FUNCTION_PARAMETERS)
 }
 
 
-void php3_sybase_fetch_array(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(sybase_fetch_array)
 {
 	php3_sybase_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU);
 }
 
-void php3_sybase_data_seek(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(sybase_data_seek)
 {
 	pval *sybase_result_index,*offset;
 	int type,id;
@@ -1041,7 +1041,7 @@ static char *php3_sybase_get_field_name(int type)
 }
 
 
-void php3_sybase_fetch_field(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(sybase_fetch_field)
 {
 	pval *sybase_result_index,*offset;
 	int type,id,field_offset;
@@ -1097,7 +1097,7 @@ void php3_sybase_fetch_field(INTERNAL_FUNCTION_PARAMETERS)
 	add_property_string(return_value, "type", php3_sybase_get_field_name(result->fields[field_offset].type), 1);
 }
 
-void php3_sybase_field_seek(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(sybase_field_seek)
 {
 	pval *sybase_result_index,*offset;
 	int type,id,field_offset;
@@ -1129,7 +1129,7 @@ void php3_sybase_field_seek(INTERNAL_FUNCTION_PARAMETERS)
 }
 
 
-void php3_sybase_result(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(sybase_result)
 {
 	pval *row, *field, *sybase_result_index;
 	int id,type,field_offset=0;
@@ -1217,7 +1217,7 @@ void php3_info_sybase(ZEND_MODULE_INFO_FUNC_ARGS)
 }
 
 
-void php3_sybase_min_error_severity(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(sybase_min_error_severity)
 {
 	pval *severity;
 	
@@ -1229,7 +1229,7 @@ void php3_sybase_min_error_severity(INTERNAL_FUNCTION_PARAMETERS)
 }
 
 
-void php3_sybase_min_message_severity(INTERNAL_FUNCTION_PARAMETERS)
+PHP_FUNCTION(sybase_min_message_severity)
 {
 	pval *severity;