Since the generated arginfo handled this, remove from ibm_db2.c

Also fix up the defs to actually work, since we're using generated

Author: NattyNarwhal

ibm_db2.c

@@ -198,381 +198,25 @@ typedef struct _stmt_handle_struct {
 #define STRCASECMP strcasecmp
 #endif
 
-/* {{{ ZEND_BEGIN_ARG_INFO
+/* {{{ Argument info
 */
 
 #if PHP_MAJOR_VERSION >= 8
-#include <ibm_db2_arginfo.h>
+#include "ibm_db2_arginfo.h"
 #else
-/* XXX: */
-ZEND_BEGIN_ARG_INFO_EX(arginfo_db2_connect, 0, 0, 3)
-	ZEND_ARG_INFO(0, database)
-	ZEND_ARG_INFO(0, username)
-	ZEND_ARG_INFO(0, password)
-	ZEND_ARG_INFO(0, options)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_db2_commit, 0, 0, 1)
-	ZEND_ARG_INFO(0, connection)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_db2_pconnect, 0, 0, 3)
-	ZEND_ARG_INFO(0, database)
-	ZEND_ARG_INFO(0, username)
-	ZEND_ARG_INFO(0, password)
-	ZEND_ARG_INFO(0, options)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_db2_autocommit, 0, 0, 1)
-	ZEND_ARG_INFO(0, autocommit)
-	ZEND_ARG_INFO(0, value)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_db2_bind_param, 0, 0, 3)
-	ZEND_ARG_INFO(0, stmt)
-	ZEND_ARG_INFO(0, parameter_number)
-	ZEND_ARG_INFO(0, variable_name)
-	ZEND_ARG_INFO(0, parameter_type)
-	ZEND_ARG_INFO(0, data_type)
-	ZEND_ARG_INFO(0, precision)
-	ZEND_ARG_INFO(0, scale)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_db2_close, 0, 0, 1)
-	ZEND_ARG_INFO(0, connection)
-ZEND_END_ARG_INFO()
-
-#ifdef PASE
-ZEND_BEGIN_ARG_INFO_EX(arginfo_db2_pclose, 0, 0, 1)
-	ZEND_ARG_INFO(0, connection)
-ZEND_END_ARG_INFO()
-#endif
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_db2_column_privileges, 0, 0, 1)
-	ZEND_ARG_INFO(0, connection)
-	ZEND_ARG_INFO(0, qualifier)
-	ZEND_ARG_INFO(0, schema)
-	ZEND_ARG_INFO(0, table_name)
-	ZEND_ARG_INFO(0, column_name)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_db2_columns, 0, 0, 1)
-	ZEND_ARG_INFO(0, connection)
-	ZEND_ARG_INFO(0, qualifier)
-	ZEND_ARG_INFO(0, schema)
-	ZEND_ARG_INFO(0, table_name)
-	ZEND_ARG_INFO(0, column_name)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_db2_foreign_keys, 0, 0, 4)
-	ZEND_ARG_INFO(0, connection)
-	ZEND_ARG_INFO(0, qualifier)
-	ZEND_ARG_INFO(0, schema)
-	ZEND_ARG_INFO(0, table_name)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_db2_primary_keys, 0, 0, 4)
-	ZEND_ARG_INFO(0, connection)
-	ZEND_ARG_INFO(0, qualifier)
-	ZEND_ARG_INFO(0, schema)
-	ZEND_ARG_INFO(0, table_name)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_db2_procedure_columns, 0, 0, 5)
-	ZEND_ARG_INFO(0, connection)
-	ZEND_ARG_INFO(0, qualifier)
-	ZEND_ARG_INFO(0, schema)
-	ZEND_ARG_INFO(0, procedure)
-	ZEND_ARG_INFO(0, parameter)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_db2_procedures, 0, 0, 4)
-	ZEND_ARG_INFO(0, connection)
-	ZEND_ARG_INFO(0, qualifier)
-	ZEND_ARG_INFO(0, schema)
-	ZEND_ARG_INFO(0, procedure)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_db2_special_columns, 0, 0, 5)
-	ZEND_ARG_INFO(0, connection)
-	ZEND_ARG_INFO(0, qualifier)
-	ZEND_ARG_INFO(0, schema)
-	ZEND_ARG_INFO(0, table_name)
-	ZEND_ARG_INFO(0, scope)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_db2_statistics, 0, 0, 5)
-	ZEND_ARG_INFO(0, connection)
-	ZEND_ARG_INFO(0, qualifier)
-	ZEND_ARG_INFO(0, schema)
-	ZEND_ARG_INFO(0, table_name)
-	ZEND_ARG_INFO(0, unique)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_db2_table_privileges, 0, 0, 1)
-	ZEND_ARG_INFO(0, connection)
-	ZEND_ARG_INFO(0, qualifier)
-	ZEND_ARG_INFO(0, schema)
-	ZEND_ARG_INFO(0, table_name)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_db2_tables, 0, 0, 1)
-	ZEND_ARG_INFO(0, connection)
-	ZEND_ARG_INFO(0, qualifier)
-	ZEND_ARG_INFO(0, schema)
-	ZEND_ARG_INFO(0, table_name)
-	ZEND_ARG_INFO(0, table_type)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_db2_exec, 0, 0, 2)
-	ZEND_ARG_INFO(0, connection)
-	ZEND_ARG_INFO(0, statement)
-	ZEND_ARG_INFO(0, options)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_db2_prepare, 0, 0, 2)
-	ZEND_ARG_INFO(0, connection)
-	ZEND_ARG_INFO(0, statement)
-	ZEND_ARG_INFO(0, options)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_db2_execute, 0, 0, 1)
-	ZEND_ARG_INFO(0, stmt)
-	ZEND_ARG_INFO(0, options)
-ZEND_END_ARG_INFO()
-
-#ifndef PASE
-/* XXX: db2_execute_many isn't documented */
-ZEND_BEGIN_ARG_INFO_EX(arginfo_db2_execute_many, 0, 0, 1)
-	ZEND_ARG_INFO(0, stmt)
-	ZEND_ARG_INFO(0, options)
-ZEND_END_ARG_INFO()
-#endif
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_db2_stmt_errormsg, 0, 0, 0)
-	ZEND_ARG_INFO(0, stmt)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_db2_conn_errormsg, 0, 0, 0)
-	ZEND_ARG_INFO(0, connection)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_db2_conn_error, 0, 0, 0)
-	ZEND_ARG_INFO(0, connection)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_db2_stmt_error, 0, 0, 0)
-	ZEND_ARG_INFO(0, stmt)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_db2_next_result, 0, 0, 1)
-	ZEND_ARG_INFO(0, stmt)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_db2_num_fields, 0, 0, 1)
-	ZEND_ARG_INFO(0, stmt)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_db2_num_rows, 0, 0, 1)
-	ZEND_ARG_INFO(0, stmt)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_db2_field_name, 0, 0, 2)
-	ZEND_ARG_INFO(0, stmt)
-	ZEND_ARG_INFO(0, column)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_db2_field_display_size, 0, 0, 2)
-	ZEND_ARG_INFO(0, stmt)
-	ZEND_ARG_INFO(0, column)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_db2_field_num, 0, 0, 2)
-	ZEND_ARG_INFO(0, stmt)
-	ZEND_ARG_INFO(0, column)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_db2_field_precision, 0, 0, 2)
-	ZEND_ARG_INFO(0, stmt)
-	ZEND_ARG_INFO(0, column)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_db2_field_scale, 0, 0, 2)
-	ZEND_ARG_INFO(0, stmt)
-	ZEND_ARG_INFO(0, column)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_db2_field_type, 0, 0, 2)
-	ZEND_ARG_INFO(0, stmt)
-	ZEND_ARG_INFO(0, column)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_db2_field_width, 0, 0, 2)
-	ZEND_ARG_INFO(0, stmt)
-	ZEND_ARG_INFO(0, column)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_db2_cursor_type, 0, 0, 1)
-	ZEND_ARG_INFO(0, stmt)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_db2_rollback, 0, 0, 1)
-	ZEND_ARG_INFO(0, connection)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_db2_free_stmt, 0, 0, 1)
-	ZEND_ARG_INFO(0, stmt)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_db2_result, 0, 0, 2)
-	ZEND_ARG_INFO(0, stmt)
-	ZEND_ARG_INFO(0, column)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_db2_fetch_row, 0, 0, 1)
-	ZEND_ARG_INFO(0, stmt)
-	ZEND_ARG_INFO(0, row_number)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_db2_fetch_assoc, 0, 0, 1)
-	ZEND_ARG_INFO(0, stmt)
-	ZEND_ARG_INFO(0, row_number)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_db2_fetch_array, 0, 0, 1)
-	ZEND_ARG_INFO(0, stmt)
-	ZEND_ARG_INFO(0, row_number)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_db2_fetch_both, 0, 0, 1)
-	ZEND_ARG_INFO(0, stmt)
-	ZEND_ARG_INFO(0, row_number)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_db2_free_result, 0, 0, 1)
-	ZEND_ARG_INFO(0, stmt)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_db2_set_option, 0, 0, 3)
-	ZEND_ARG_INFO(0, resource)
-	ZEND_ARG_INFO(0, options)
-	ZEND_ARG_INFO(0, type)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_db2_fetch_object, 0, 0, 1)
-	ZEND_ARG_INFO(0, stmt)
-	ZEND_ARG_INFO(0, row_number)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_db2_server_info, 0, 0, 1)
-	ZEND_ARG_INFO(0, connection)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_db2_client_info, 0, 0, 1)
-	ZEND_ARG_INFO(0, connection)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_db2_escape_string, 0, 0, 1)
-	ZEND_ARG_INFO(0, string_literal)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_db2_lob_read, 0, 0, 3)
-	ZEND_ARG_INFO(0, stmt)
-	ZEND_ARG_INFO(0, colnum)
-	ZEND_ARG_INFO(0, length)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_db2_get_option, 0, 0, 2)
-	ZEND_ARG_INFO(0, resource)
-	ZEND_ARG_INFO(0, option)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_db2_last_insert_id, 0, 0, 1)
-	ZEND_ARG_INFO(0, resource)
-ZEND_END_ARG_INFO()
+#include "ibm_db2_legacy_arginfo.h"
 #endif
 
 /* }}} */
 
-/* {{{ Every user visible function must have an entry in ibm_db2_functions[].
-*/
-zend_function_entry ibm_db2_functions[] = {
-    PHP_FE(db2_connect, arginfo_db2_connect)
-    PHP_FE(db2_commit, arginfo_db2_commit)
-    PHP_FE(db2_pconnect, arginfo_db2_pconnect)
-    PHP_FE(db2_autocommit, arginfo_db2_autocommit)
-    PHP_FE(db2_bind_param, arginfo_db2_bind_param)
-    PHP_FE(db2_close, arginfo_db2_close)
-#ifdef PASE /* IBM i db2_pclose last ditch pconnect close */
-    PHP_FE(db2_pclose, arginfo_db2_pclose)
-#endif /* PASE */
-    PHP_FE(db2_column_privileges, arginfo_db2_column_privileges)
-    PHP_FALIAS(db2_columnprivileges, db2_column_privileges, arginfo_db2_column_privileges)
-    PHP_FE(db2_columns, arginfo_db2_columns)
-    PHP_FE(db2_foreign_keys, arginfo_db2_foreign_keys)
-    PHP_FALIAS(db2_foreignkeys, db2_foreign_keys, arginfo_db2_foreign_keys)
-    PHP_FE(db2_primary_keys, arginfo_db2_primary_keys)
-    PHP_FALIAS(db2_primarykeys, db2_primary_keys, arginfo_db2_primary_keys)
-    PHP_FE(db2_procedure_columns, arginfo_db2_procedure_columns)
-    PHP_FALIAS(db2_procedurecolumns, db2_procedure_columns, arginfo_db2_procedure_columns)
-    PHP_FE(db2_procedures, arginfo_db2_procedures)
-    PHP_FE(db2_special_columns, arginfo_db2_special_columns)
-    PHP_FALIAS(db2_specialcolumns, db2_special_columns, arginfo_db2_special_columns)
-    PHP_FE(db2_statistics, arginfo_db2_statistics)
-    PHP_FE(db2_table_privileges, arginfo_db2_table_privileges)
-    PHP_FALIAS(db2_tableprivileges, db2_table_privileges, arginfo_db2_table_privileges)
-    PHP_FE(db2_tables, arginfo_db2_tables)
-    PHP_FE(db2_exec, arginfo_db2_exec)
-    PHP_FE(db2_prepare, arginfo_db2_prepare)
-    PHP_FE(db2_execute, arginfo_db2_execute)
-#ifndef PASE /* IBM i execute many unsupported */
-    PHP_FE(db2_execute_many, arginfo_db2_execute_many)
-#endif /* PASE */
-    PHP_FE(db2_stmt_errormsg, arginfo_db2_stmt_errormsg)
-    PHP_FE(db2_conn_errormsg, arginfo_db2_conn_errormsg)
-    PHP_FE(db2_conn_error, arginfo_db2_conn_error)
-    PHP_FE(db2_stmt_error, arginfo_db2_stmt_error)
-    PHP_FE(db2_next_result, arginfo_db2_next_result)
-    PHP_FE(db2_num_fields, arginfo_db2_num_fields)
-    PHP_FE(db2_num_rows, arginfo_db2_num_rows)
-    PHP_FE(db2_field_name, arginfo_db2_field_name)
-    PHP_FE(db2_field_display_size, arginfo_db2_field_display_size)
-    PHP_FE(db2_field_num, arginfo_db2_field_num)
-    PHP_FE(db2_field_precision, arginfo_db2_field_precision)
-    PHP_FE(db2_field_scale, arginfo_db2_field_scale)
-    PHP_FE(db2_field_type, arginfo_db2_field_type)
-    PHP_FE(db2_field_width, arginfo_db2_field_width)
-    PHP_FE(db2_cursor_type, arginfo_db2_cursor_type)
-    PHP_FE(db2_rollback, arginfo_db2_rollback)
-    PHP_FE(db2_free_stmt, arginfo_db2_free_stmt)
-    PHP_FE(db2_result, arginfo_db2_result)
-    PHP_FE(db2_fetch_row, arginfo_db2_fetch_row)
-    PHP_FE(db2_fetch_assoc, arginfo_db2_fetch_assoc)
-    PHP_FE(db2_fetch_array, arginfo_db2_fetch_array)
-    PHP_FE(db2_fetch_both, arginfo_db2_fetch_both)
-    PHP_FE(db2_free_result, arginfo_db2_free_result)
-    PHP_FE(db2_set_option, arginfo_db2_set_option)
-    PHP_FALIAS(db2_setoption, db2_set_option, arginfo_db2_set_option)
-    PHP_FE(db2_fetch_object, arginfo_db2_fetch_object)
-    PHP_FE(db2_server_info, arginfo_db2_server_info)
-    PHP_FE(db2_client_info, arginfo_db2_client_info)
-    PHP_FE(db2_escape_string, arginfo_db2_escape_string)
-    PHP_FE(db2_lob_read, arginfo_db2_lob_read)
-    PHP_FE(db2_get_option, arginfo_db2_get_option)
-    PHP_FALIAS(db2_getoption, db2_get_option, arginfo_db2_get_option)
-    PHP_FE(db2_last_insert_id, arginfo_db2_last_insert_id)
-    {NULL, NULL, NULL}  /* Must be the last line in ibm_db2_functions[] */
-};
-/* }}} */
-
 /* {{{ ibm_db2_module_entry
 */
 zend_module_entry ibm_db2_module_entry = {
 #if ZEND_MODULE_API_NO >= 20010901
     STANDARD_MODULE_HEADER,
 #endif
     "ibm_db2",
-    ibm_db2_functions,
+    ext_functions,
     PHP_MINIT(ibm_db2),
     PHP_MSHUTDOWN(ibm_db2),
     NULL,       /* Replace with NULL if there's nothing to do at request start */