zeev Sun Aug 3 13:44:39 2003 EDT Modified files: /php-src/ext/curl interface.c /php-src/ext/exif exif.c /php-src/ext/gmp gmp.c /php-src/ext/ldap ldap.c /php-src/ext/mbstring mbstring.c /php-src/ext/mcve mcve.c /php-src/ext/mssql php_mssql.c /php-src/ext/mysqli mysqli_fe.c /php-src/ext/ncurses ncurses_fe.c /php-src/ext/oci8 oci8.c /php-src/ext/odbc php_odbc.c /php-src/ext/openssl openssl.c /php-src/ext/oracle oracle.c /php-src/ext/simplexml simplexml.c /php-src/ext/sockets sockets.c /php-src/ext/sqlite sqlite.c /php-src/ext/standard basic_functions.c /php-src/ext/sysvmsg sysvmsg.c /php-src/ext/xml xml.c /php-src/ext/xmlrpc xmlrpc-epi-php.c /php-src/ext/yaz php_yaz.c Log: Use new infrastructure. There are bound to be some messups, please report build/runtime bugs!
Index: php-src/ext/curl/interface.c diff -u php-src/ext/curl/interface.c:1.24 php-src/ext/curl/interface.c:1.25 --- php-src/ext/curl/interface.c:1.24 Sat Jun 28 05:55:12 2003 +++ php-src/ext/curl/interface.c Sun Aug 3 13:44:35 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: interface.c,v 1.24 2003/06/28 09:55:12 derick Exp $ */ +/* $Id: interface.c,v 1.25 2003/08/03 17:44:35 zeev Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -55,8 +55,6 @@ #define CAAS(s, v) add_assoc_string_ex(return_value, s, sizeof(s), (char *) v, 1); #define CAAZ(s, v) add_assoc_zval_ex(return_value, s, sizeof(s), (zval *) v); -static const unsigned char second_args_force_ref[] = { 2, BYREF_NONE, BYREF_FORCE }; - /* {{{ curl_functions[] */ function_entry curl_functions[] = { @@ -72,7 +70,7 @@ PHP_FE(curl_multi_add_handle, NULL) PHP_FE(curl_multi_remove_handle, NULL) PHP_FE(curl_multi_select, NULL) - PHP_FE(curl_multi_exec, second_args_force_ref) + PHP_FE(curl_multi_exec, second_arg_force_ref) PHP_FE(curl_multi_getcontent, NULL) PHP_FE(curl_multi_info_read, NULL) PHP_FE(curl_multi_close, NULL) Index: php-src/ext/exif/exif.c diff -u php-src/ext/exif/exif.c:1.152 php-src/ext/exif/exif.c:1.153 --- php-src/ext/exif/exif.c:1.152 Fri Jun 20 14:24:38 2003 +++ php-src/ext/exif/exif.c Sun Aug 3 13:44:36 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: exif.c,v 1.152 2003/06/20 18:24:38 helly Exp $ */ +/* $Id: exif.c,v 1.153 2003/08/03 17:44:36 zeev Exp $ */ /* ToDos * @@ -93,7 +93,10 @@ #define EFREE_IF(ptr) if (ptr) efree(ptr) -static unsigned char exif_thumbnail_force_ref[] = {2, BYREF_NONE, BYREF_FORCE_REST}; +static +ZEND_BEGIN_ARG_INFO(exif_thumbnail_force_ref, 1) +ZEND_END_ARG_INFO(); + /* {{{ exif_functions[] */ @@ -107,7 +110,7 @@ }; /* }}} */ -#define EXIF_VERSION "1.4 $Id: exif.c,v 1.152 2003/06/20 18:24:38 helly Exp $" +#define EXIF_VERSION "1.4 $Id: exif.c,v 1.153 2003/08/03 17:44:36 zeev Exp $" /* {{{ PHP_MINFO_FUNCTION */ Index: php-src/ext/gmp/gmp.c diff -u php-src/ext/gmp/gmp.c:1.33 php-src/ext/gmp/gmp.c:1.34 --- php-src/ext/gmp/gmp.c:1.33 Tue Jun 10 16:03:29 2003 +++ php-src/ext/gmp/gmp.c Sun Aug 3 13:44:36 2003 @@ -35,8 +35,6 @@ /* True global resources - no need for thread safety here */ static int le_gmp; -static unsigned char first_of_two_force_ref[] = { 2, BYREF_FORCE, BYREF_NONE }; - /* {{{ gmp_functions[] */ function_entry gmp_functions[] = { @@ -73,8 +71,8 @@ ZEND_FE(gmp_or, NULL) ZEND_FE(gmp_com, NULL) ZEND_FE(gmp_xor, NULL) - ZEND_FE(gmp_setbit, first_of_two_force_ref) - ZEND_FE(gmp_clrbit, first_of_two_force_ref) + ZEND_FE(gmp_setbit, first_arg_force_ref) + ZEND_FE(gmp_clrbit, first_arg_force_ref) ZEND_FE(gmp_scan0, NULL) ZEND_FE(gmp_scan1, NULL) ZEND_FE(gmp_popcount, NULL) Index: php-src/ext/ldap/ldap.c diff -u php-src/ext/ldap/ldap.c:1.142 php-src/ext/ldap/ldap.c:1.143 --- php-src/ext/ldap/ldap.c:1.142 Fri Jun 13 09:30:46 2003 +++ php-src/ext/ldap/ldap.c Sun Aug 3 13:44:36 2003 @@ -22,7 +22,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: ldap.c,v 1.142 2003/06/13 13:30:46 sniper Exp $ */ +/* $Id: ldap.c,v 1.143 2003/08/03 17:44:36 zeev Exp $ */ #define IS_EXT_MODULE #ifdef HAVE_CONFIG_H @@ -79,8 +79,15 @@ ZEND_DECLARE_MODULE_GLOBALS(ldap) -static unsigned char third_argument_force_ref[] = { 3, BYREF_NONE, BYREF_NONE, BYREF_FORCE }; -static unsigned char arg3to6of6_force_ref[] = { 6, BYREF_NONE, BYREF_NONE, BYREF_FORCE, BYREF_FORCE, BYREF_FORCE, BYREF_FORCE }; +static + ZEND_BEGIN_ARG_INFO(arg3to6of6_force_ref, 0) + ZEND_ARG_PASS_INFO(0) + ZEND_ARG_PASS_INFO(0) + ZEND_ARG_PASS_INFO(0) + ZEND_ARG_PASS_INFO(1) + ZEND_ARG_PASS_INFO(1) + ZEND_ARG_PASS_INFO(1) + ZEND_END_ARG_INFO(); static int le_link, le_result, le_result_entry, le_ber_entry; @@ -106,8 +113,8 @@ PHP_FE(ldap_first_entry, NULL) PHP_FE(ldap_next_entry, NULL) PHP_FE(ldap_get_entries, NULL) - PHP_FE(ldap_first_attribute, third_argument_force_ref) - PHP_FE(ldap_next_attribute, third_argument_force_ref) + PHP_FE(ldap_first_attribute, third_arg_force_ref) + PHP_FE(ldap_next_attribute, third_arg_force_ref) PHP_FE(ldap_get_attributes, NULL) PHP_FE(ldap_get_values, NULL) PHP_FE(ldap_get_values_len, NULL) @@ -131,13 +138,13 @@ PHP_FE(ldap_sort, NULL) #if (LDAP_API_VERSION > 2000) || HAVE_NSLDAP - PHP_FE(ldap_get_option, third_argument_force_ref) + PHP_FE(ldap_get_option, third_arg_force_ref) PHP_FE(ldap_set_option, NULL) PHP_FE(ldap_parse_result, arg3to6of6_force_ref) PHP_FE(ldap_first_reference, NULL) PHP_FE(ldap_next_reference, NULL) #ifdef HAVE_LDAP_PARSE_REFERENCE - PHP_FE(ldap_parse_reference, third_argument_force_ref) + PHP_FE(ldap_parse_reference, third_arg_force_ref) #endif PHP_FE(ldap_rename, NULL) #ifdef HAVE_LDAP_START_TLS_S @@ -292,7 +299,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "LDAP Support", "enabled"); - php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.142 2003/06/13 13:30:46 sniper Exp $"); + php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.143 2003/08/03 17:44:36 zeev Exp $"); if (LDAPG(max_links) == -1) { snprintf(tmp, 31, "%ld/unlimited", LDAPG(num_links)); Index: php-src/ext/mbstring/mbstring.c diff -u php-src/ext/mbstring/mbstring.c:1.179 php-src/ext/mbstring/mbstring.c:1.180 --- php-src/ext/mbstring/mbstring.c:1.179 Mon Jul 14 19:09:46 2003 +++ php-src/ext/mbstring/mbstring.c Sun Aug 3 13:44:36 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mbstring.c,v 1.179 2003/07/14 23:09:46 hirokawa Exp $ */ +/* $Id: mbstring.c,v 1.180 2003/08/03 17:44:36 zeev Exp $ */ /* * PHP4 Multibyte String module "mbstring" @@ -144,11 +144,11 @@ static const int php_mb_default_identify_list_size = sizeof(php_mb_default_identify_list)/sizeof(enum mbfl_no_encoding); /* }}} */ -static const unsigned char third_and_rest_force_ref[] = { 3, BYREF_NONE, BYREF_NONE, BYREF_FORCE_REST }; -static const unsigned char second_args_force_ref[] = { 2, BYREF_NONE, BYREF_FORCE }; -#if HAVE_MBREGEX -static const unsigned char third_argument_force_ref[] = { 3, BYREF_NONE, BYREF_NONE, BYREF_FORCE }; -#endif +static const + ZEND_BEGIN_ARG_INFO(third_and_rest_force_ref, 1) + ZEND_ARG_PASS_INFO(0) + ZEND_ARG_PASS_INFO(0) + ZEND_END_ARG_INFO(); /* {{{ mb_overload_def mb_ovld[] */ static const struct mb_overload_def mb_ovld[] = { @@ -197,7 +197,7 @@ PHP_FE(mb_http_output, NULL) PHP_FE(mb_detect_order, NULL) PHP_FE(mb_substitute_character, NULL) - PHP_FE(mb_parse_str, (unsigned char *)second_args_force_ref) + PHP_FE(mb_parse_str, (unsigned char *)second_arg_force_ref) PHP_FE(mb_output_handler, NULL) PHP_FE(mb_preferred_mime_name, NULL) PHP_FE(mb_strlen, NULL) Index: php-src/ext/mcve/mcve.c diff -u php-src/ext/mcve/mcve.c:1.21 php-src/ext/mcve/mcve.c:1.22 --- php-src/ext/mcve/mcve.c:1.21 Wed Jul 9 09:45:19 2003 +++ php-src/ext/mcve/mcve.c Sun Aug 3 13:44:36 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mcve.c,v 1.21 2003/07/09 13:45:19 bradmssw Exp $ */ +/* $Id: mcve.c,v 1.22 2003/08/03 17:44:36 zeev Exp $ */ /* standard php include(s) */ #include "php.h" @@ -39,7 +39,6 @@ /* }}} */ /* {{{ extension definition structures */ -static unsigned char second_arg_force_ref[] = { 2, BYREF_NONE, BYREF_FORCE }; function_entry mcve_functions[] = { PHP_FE(mcve_initengine, NULL) Index: php-src/ext/mssql/php_mssql.c diff -u php-src/ext/mssql/php_mssql.c:1.117 php-src/ext/mssql/php_mssql.c:1.118 --- php-src/ext/mssql/php_mssql.c:1.117 Wed Jul 23 12:54:34 2003 +++ php-src/ext/mssql/php_mssql.c Sun Aug 3 13:44:36 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mssql.c,v 1.117 2003/07/23 16:54:34 iliaa Exp $ */ +/* $Id: php_mssql.c,v 1.118 2003/08/03 17:44:36 zeev Exp $ */ #ifdef COMPILE_DL_MSSQL #define HAVE_MSSQL 1 @@ -46,7 +46,6 @@ static void php_mssql_get_column_content_without_type(mssql_link *mssql_ptr,int offset,zval *result, int column_type TSRMLS_DC); static void _mssql_bind_hash_dtor(void *data); -static unsigned char a3_arg_force_ref[] = { 3, BYREF_NONE, BYREF_NONE, BYREF_FORCE }; function_entry mssql_functions[] = { PHP_FE(mssql_connect, NULL) @@ -75,7 +74,7 @@ PHP_FE(mssql_min_error_severity, NULL) PHP_FE(mssql_min_message_severity, NULL) PHP_FE(mssql_init, NULL) - PHP_FE(mssql_bind, a3_arg_force_ref) + PHP_FE(mssql_bind, third_arg_force_ref) PHP_FE(mssql_execute, NULL) PHP_FE(mssql_free_statement, NULL) PHP_FE(mssql_guid_string, NULL) Index: php-src/ext/mysqli/mysqli_fe.c diff -u php-src/ext/mysqli/mysqli_fe.c:1.16 php-src/ext/mysqli/mysqli_fe.c:1.17 --- php-src/ext/mysqli/mysqli_fe.c:1.16 Fri Jul 18 02:17:39 2003 +++ php-src/ext/mysqli/mysqli_fe.c Sun Aug 3 13:44:36 2003 @@ -15,7 +15,7 @@ | Author: Georg Richter <[EMAIL PROTECTED]> | +----------------------------------------------------------------------+ - $Id: mysqli_fe.c,v 1.16 2003/07/18 06:17:39 georg Exp $ + $Id: mysqli_fe.c,v 1.17 2003/08/03 17:44:36 zeev Exp $ */ #ifdef HAVE_CONFIG_H @@ -30,9 +30,16 @@ #include "php_mysqli.h" -static char all_arg_force_by_ref_rest[] = {1, BYREF_FORCE_REST}; -static char second_arg_force_by_ref_rest[] = {2, BYREF_NONE, BYREF_FORCE_REST}; -static char third_arg_force_by_ref_rest[] = {3, BYREF_NONE, BYREF_NONE, BYREF_FORCE_REST}; +static + ZEND_BEGIN_ARG_INFO(second_arg_force_by_ref_rest, 1) + ZEND_ARG_PASS_INFO(0) + ZEND_END_ARG_INFO(); + +static + ZEND_BEGIN_ARG_INFO(third_arg_force_by_ref_rest, 1) + ZEND_ARG_PASS_INFO(0) + ZEND_ARG_PASS_INFO(0) + ZEND_END_ARG_INFO(); /* {{{ mysqli_functions[] * @@ -230,7 +237,7 @@ function_entry mysqli_stmt_methods[] = { PHP_FALIAS(affected_rows,mysqli_stmt_affected_rows,NULL) PHP_FALIAS(bind_param,mysqli_bind_param,second_arg_force_by_ref_rest) - PHP_FALIAS(bind_result,mysqli_bind_result,all_arg_force_by_ref_rest) + PHP_FALIAS(bind_result,mysqli_bind_result, all_args_force_ref) PHP_FALIAS(execute,mysqli_execute,NULL) PHP_FALIAS(fetch,mysqli_fetch,NULL) PHP_FALIAS(param_count,mysqli_param_count,NULL) Index: php-src/ext/ncurses/ncurses_fe.c diff -u php-src/ext/ncurses/ncurses_fe.c:1.23 php-src/ext/ncurses/ncurses_fe.c:1.24 --- php-src/ext/ncurses/ncurses_fe.c:1.23 Tue Jun 10 16:03:33 2003 +++ php-src/ext/ncurses/ncurses_fe.c Sun Aug 3 13:44:37 2003 @@ -25,11 +25,26 @@ #include "php_ini.h" #include "php_ncurses.h" -static unsigned char first_args_force_ref[] = {1, BYREF_FORCE}; -static unsigned char firstandsecond_args_force_ref[] = {2, BYREF_FORCE, BYREF_FORCE}; -static unsigned char second_args_force_ref[] = {2, BYREF_NONE, BYREF_FORCE}; -static unsigned char secondandthird_args_force_ref[] = {3, BYREF_NONE, BYREF_FORCE, BYREF_FORCE}; -static unsigned char second_thru_fourth_args_force_ref[] = {4, BYREF_NONE, BYREF_FORCE, BYREF_FORCE, BYREF_FORCE}; +static + ZEND_BEGIN_ARG_INFO(firstandsecond_args_force_ref, 0) + ZEND_ARG_PASS_INFO(1) + ZEND_ARG_PASS_INFO(1) + ZEND_END_ARG_INFO(); + +static + ZEND_BEGIN_ARG_INFO(secondandthird_args_force_ref, 0) + ZEND_ARG_PASS_INFO(0) + ZEND_ARG_PASS_INFO(1) + ZEND_ARG_PASS_INFO(1) + ZEND_END_ARG_INFO(); + +static + ZEND_BEGIN_ARG_INFO(second_thru_fourth_args_force_ref, 0) + ZEND_ARG_PASS_INFO(0) + ZEND_ARG_PASS_INFO(1) + ZEND_ARG_PASS_INFO(1) + ZEND_ARG_PASS_INFO(1) + ZEND_END_ARG_INFO(); /* ncurses_functions[] * @@ -151,7 +166,7 @@ PHP_FE(ncurses_mvinch, NULL) PHP_FE(ncurses_mvwaddstr, NULL) PHP_FE(ncurses_insstr, NULL) - PHP_FE(ncurses_instr, first_args_force_ref) + PHP_FE(ncurses_instr, first_arg_force_ref) PHP_FE(ncurses_mvhline, NULL) PHP_FE(ncurses_mvcur, NULL) PHP_FE(ncurses_init_color, NULL) @@ -165,8 +180,8 @@ PHP_FE(ncurses_keyok, NULL) PHP_FE(ncurses_termname, NULL) PHP_FE(ncurses_longname, NULL) - PHP_FE(ncurses_mousemask, second_args_force_ref) - PHP_FE(ncurses_getmouse, first_args_force_ref) + PHP_FE(ncurses_mousemask, second_arg_force_ref) + PHP_FE(ncurses_getmouse, first_arg_force_ref) PHP_FE(ncurses_ungetmouse, NULL) PHP_FE(ncurses_mouse_trafo, firstandsecond_args_force_ref) PHP_FE(ncurses_wmouse_trafo, secondandthird_args_force_ref) Index: php-src/ext/oci8/oci8.c diff -u php-src/ext/oci8/oci8.c:1.212 php-src/ext/oci8/oci8.c:1.213 --- php-src/ext/oci8/oci8.c:1.212 Tue Jul 22 06:38:34 2003 +++ php-src/ext/oci8/oci8.c Sun Aug 3 13:44:37 2003 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: oci8.c,v 1.212 2003/07/22 10:38:34 thies Exp $ */ +/* $Id: oci8.c,v 1.213 2003/08/03 17:44:37 zeev Exp $ */ /* TODO list: * @@ -302,12 +302,9 @@ #define OCI_FETCHSTATEMENT_BY_ROW 1<<5 #define OCI_FETCHSTATEMENT_BY (OCI_FETCHSTATEMENT_BY_COLUMN | OCI_FETCHSTATEMENT_BY_ROW) -static unsigned char a3_arg_force_ref[] = { 3, BYREF_NONE, BYREF_NONE, BYREF_FORCE }; -static unsigned char a2_arg_force_ref[] = { 2, BYREF_NONE, BYREF_FORCE }; - static zend_function_entry php_oci_functions[] = { - PHP_FE(ocidefinebyname, a3_arg_force_ref) - PHP_FE(ocibindbyname, a3_arg_force_ref) + PHP_FE(ocidefinebyname, third_arg_force_ref) + PHP_FE(ocibindbyname, third_arg_force_ref) PHP_FE(ocicolumnisnull, NULL) PHP_FE(ocicolumnname, NULL) PHP_FE(ocicolumnsize, NULL) @@ -318,8 +315,8 @@ PHP_FE(ociexecute, NULL) PHP_FE(ocicancel, NULL) PHP_FE(ocifetch, NULL) - PHP_FE(ocifetchinto, a2_arg_force_ref) - PHP_FE(ocifetchstatement, a2_arg_force_ref) + PHP_FE(ocifetchinto, second_arg_force_ref) + PHP_FE(ocifetchstatement, second_arg_force_ref) PHP_FE(ocifreestatement, NULL) PHP_FE(ociinternaldebug, NULL) PHP_FE(ocinumcols, NULL) @@ -647,7 +644,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "OCI8 Support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.212 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.213 $"); #ifndef PHP_WIN32 php_info_print_table_row(2, "Oracle Version", PHP_OCI8_VERSION ); php_info_print_table_row(2, "Compile-time ORACLE_HOME", PHP_OCI8_DIR ); Index: php-src/ext/odbc/php_odbc.c diff -u php-src/ext/odbc/php_odbc.c:1.167 php-src/ext/odbc/php_odbc.c:1.168 --- php-src/ext/odbc/php_odbc.c:1.167 Fri Jul 11 09:13:32 2003 +++ php-src/ext/odbc/php_odbc.c Sun Aug 3 13:44:37 2003 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_odbc.c,v 1.167 2003/07/11 13:13:32 kalowsky Exp $ */ +/* $Id: php_odbc.c,v 1.168 2003/08/03 17:44:37 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -66,8 +66,6 @@ #define SAFE_SQL_NTS(n) ((SWORD) ((n)?(SQL_NTS):0)) -static unsigned char a3_arg3_and_3_force_ref[] = { 3, BYREF_NONE, BYREF_FORCE, BYREF_ALLOW}; - /* {{{ odbc_functions[] */ function_entry odbc_functions[] = { @@ -91,7 +89,7 @@ PHP_FE(odbc_fetch_object, NULL) #endif PHP_FE(odbc_fetch_row, NULL) - PHP_FE(odbc_fetch_into, a3_arg3_and_3_force_ref) + PHP_FE(odbc_fetch_into, second_arg_force_ref) PHP_FE(odbc_field_len, NULL) PHP_FE(odbc_field_scale, NULL) PHP_FE(odbc_field_name, NULL) Index: php-src/ext/openssl/openssl.c diff -u php-src/ext/openssl/openssl.c:1.78 php-src/ext/openssl/openssl.c:1.79 --- php-src/ext/openssl/openssl.c:1.78 Sun Jul 13 05:54:40 2003 +++ php-src/ext/openssl/openssl.c Sun Aug 3 13:44:37 2003 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: openssl.c,v 1.78 2003/07/13 09:54:40 sr Exp $ */ +/* $Id: openssl.c,v 1.79 2003/08/03 17:44:37 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -52,10 +52,12 @@ #define DEBUG_SMIME 0 -static unsigned char arg2_force_ref[] = - { 2, BYREF_NONE, BYREF_FORCE }; -static unsigned char arg2and3_force_ref[] = - { 3, BYREF_NONE, BYREF_FORCE, BYREF_FORCE }; +static + ZEND_BEGIN_ARG_INFO(arg2and3_force_ref, 0) + ZEND_ARG_PASS_INFO(0) + ZEND_ARG_PASS_INFO(1) + ZEND_ARG_PASS_INFO(1) + ZEND_END_ARG_INFO(); enum php_openssl_key_type { OPENSSL_KEYTYPE_RSA, @@ -80,7 +82,7 @@ /* public/private key functions */ PHP_FE(openssl_pkey_free, NULL) PHP_FE(openssl_pkey_new, NULL) - PHP_FE(openssl_pkey_export, arg2_force_ref) + PHP_FE(openssl_pkey_export, second_arg_force_ref) PHP_FE(openssl_pkey_export_to_file, NULL) PHP_FE(openssl_pkey_get_private, NULL) PHP_FE(openssl_pkey_get_public, NULL) @@ -95,19 +97,19 @@ PHP_FE(openssl_x509_parse, NULL) PHP_FE(openssl_x509_checkpurpose, NULL) PHP_FE(openssl_x509_check_private_key, NULL) - PHP_FE(openssl_x509_export, arg2_force_ref) + PHP_FE(openssl_x509_export, second_arg_force_ref) PHP_FE(openssl_x509_export_to_file, NULL) /* CSR funcs */ - PHP_FE(openssl_csr_new, arg2_force_ref) - PHP_FE(openssl_csr_export, arg2_force_ref) + PHP_FE(openssl_csr_new, second_arg_force_ref) + PHP_FE(openssl_csr_export, second_arg_force_ref) PHP_FE(openssl_csr_export_to_file, NULL) PHP_FE(openssl_csr_sign, NULL) - PHP_FE(openssl_sign, arg2_force_ref) + PHP_FE(openssl_sign, second_arg_force_ref) PHP_FE(openssl_verify, NULL) PHP_FE(openssl_seal, arg2and3_force_ref) - PHP_FE(openssl_open, arg2_force_ref) + PHP_FE(openssl_open, second_arg_force_ref) /* for S/MIME handling */ PHP_FE(openssl_pkcs7_verify, NULL) @@ -115,10 +117,10 @@ PHP_FE(openssl_pkcs7_sign, NULL) PHP_FE(openssl_pkcs7_encrypt, NULL) - PHP_FE(openssl_private_encrypt, arg2_force_ref) - PHP_FE(openssl_private_decrypt, arg2_force_ref) - PHP_FE(openssl_public_encrypt, arg2_force_ref) - PHP_FE(openssl_public_decrypt, arg2_force_ref) + PHP_FE(openssl_private_encrypt, second_arg_force_ref) + PHP_FE(openssl_private_decrypt, second_arg_force_ref) + PHP_FE(openssl_public_encrypt, second_arg_force_ref) + PHP_FE(openssl_public_decrypt, second_arg_force_ref) PHP_FE(openssl_error_string, NULL) {NULL, NULL, NULL} Index: php-src/ext/oracle/oracle.c diff -u php-src/ext/oracle/oracle.c:1.90 php-src/ext/oracle/oracle.c:1.91 --- php-src/ext/oracle/oracle.c:1.90 Sun Jun 22 10:33:03 2003 +++ php-src/ext/oracle/oracle.c Sun Aug 3 13:44:37 2003 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: oracle.c,v 1.90 2003/06/22 14:33:03 andrey Exp $ */ +/* $Id: oracle.c,v 1.91 2003/08/03 17:44:37 zeev Exp $ */ /* comment out the next line if you're on Oracle 7.x and don't have the olog call. */ @@ -109,8 +109,6 @@ PHP_MINFO_FUNCTION(oracle); /* }}} */ -static unsigned char second_args_force_ref[] = { 2, BYREF_NONE, BYREF_FORCE }; - /* {{{ oracle_functions[] */ function_entry oracle_functions[] = { @@ -124,7 +122,7 @@ PHP_FE(ora_errorcode, NULL) PHP_FE(ora_exec, NULL) PHP_FE(ora_fetch, NULL) - PHP_FE(ora_fetch_into, second_args_force_ref) + PHP_FE(ora_fetch_into, second_arg_force_ref) PHP_FE(ora_columntype, NULL) PHP_FE(ora_columnname, NULL) PHP_FE(ora_columnsize, NULL) Index: php-src/ext/simplexml/simplexml.c diff -u php-src/ext/simplexml/simplexml.c:1.53 php-src/ext/simplexml/simplexml.c:1.54 --- php-src/ext/simplexml/simplexml.c:1.53 Wed Jul 23 04:53:23 2003 +++ php-src/ext/simplexml/simplexml.c Sun Aug 3 13:44:37 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: simplexml.c,v 1.53 2003/07/23 08:53:23 zeev Exp $ */ +/* $Id: simplexml.c,v 1.54 2003/08/03 17:44:37 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -489,7 +489,8 @@ f = emalloc(sizeof(zend_internal_function)); f->type = ZEND_OVERLOADED_FUNCTION; - f->arg_types = NULL; + f->arg_info = NULL; + f->num_args = 0; f->scope = sxe_class_entry; f->fn_flags = 0; f->function_name = estrndup(name, len); @@ -807,6 +808,7 @@ sxe_object_set, sxe_property_exists, sxe_property_delete, + NULL, sxe_properties_get, sxe_method_get, sxe_call_method, @@ -1055,7 +1057,7 @@ { php_info_print_table_start(); php_info_print_table_header(2, "Simplexml support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.53 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.54 $"); php_info_print_table_end(); } /* }}} */ Index: php-src/ext/sockets/sockets.c diff -u php-src/ext/sockets/sockets.c:1.147 php-src/ext/sockets/sockets.c:1.148 --- php-src/ext/sockets/sockets.c:1.147 Tue Jul 22 03:20:55 2003 +++ php-src/ext/sockets/sockets.c Sun Aug 3 13:44:37 2003 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sockets.c,v 1.147 2003/07/22 07:20:55 jason Exp $ */ +/* $Id: sockets.c,v 1.148 2003/08/03 17:44:37 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -96,23 +96,40 @@ static int le_socket; #define le_socket_name "Socket" -static unsigned char first_through_third_args_force_ref[] = -{3, BYREF_FORCE, BYREF_FORCE, BYREF_FORCE}; - -static unsigned char second_and_third_args_force_ref[] = -{3, BYREF_NONE, BYREF_FORCE, BYREF_FORCE}; - -static unsigned char second_arg_of_four_force_ref[] = -{4, BYREF_NONE, BYREF_FORCE, BYREF_NONE, BYREF_NONE}; - -static unsigned char fourth_arg_force_ref[] = -{4, BYREF_NONE, BYREF_NONE, BYREF_NONE, BYREF_FORCE}; +static + ZEND_BEGIN_ARG_INFO(first_through_third_args_force_ref, 0) + ZEND_ARG_PASS_INFO(1) + ZEND_ARG_PASS_INFO(1) + ZEND_ARG_PASS_INFO(1) + ZEND_END_ARG_INFO(); + +static + ZEND_BEGIN_ARG_INFO(second_and_third_args_force_ref, 0) + ZEND_ARG_PASS_INFO(0) + ZEND_ARG_PASS_INFO(1) + ZEND_ARG_PASS_INFO(1) + ZEND_END_ARG_INFO(); static unsigned char second_fifth_and_sixth_args_force_ref[] = -{6, BYREF_NONE, BYREF_FORCE, BYREF_NONE, BYREF_NONE, BYREF_FORCE, BYREF_FORCE}; - -static unsigned char third_through_seventh_args_force_ref[] = -{7, BYREF_NONE, BYREF_NONE, BYREF_FORCE, BYREF_FORCE, BYREF_FORCE, BYREF_FORCE, BYREF_FORCE}; + ZEND_BEGIN_ARG_INFO(second_fifth_and_sixth_args_force_ref, 0) + ZEND_ARG_PASS_INFO(0) + ZEND_ARG_PASS_INFO(1) + ZEND_ARG_PASS_INFO(0) + ZEND_ARG_PASS_INFO(0) + ZEND_ARG_PASS_INFO(1) + ZEND_ARG_PASS_INFO(1) + ZEND_END_ARG_INFO(); + +static + ZEND_BEGIN_ARG_INFO(third_through_seventh_args_force_ref, 0) + ZEND_ARG_PASS_INFO(0) + ZEND_ARG_PASS_INFO(0) + ZEND_ARG_PASS_INFO(1) + ZEND_ARG_PASS_INFO(1) + ZEND_ARG_PASS_INFO(1) + ZEND_ARG_PASS_INFO(1) + ZEND_ARG_PASS_INFO(1) + ZEND_END_ARG_INFO(); /* {{{ sockets_functions[] */ @@ -139,7 +156,7 @@ PHP_FE(socket_connect, NULL) PHP_FE(socket_strerror, NULL) PHP_FE(socket_bind, NULL) - PHP_FE(socket_recv, second_arg_of_four_force_ref) + PHP_FE(socket_recv, second_arg_force_ref) PHP_FE(socket_send, NULL) PHP_FE(socket_recvfrom, second_fifth_and_sixth_args_force_ref) PHP_FE(socket_sendto, NULL) Index: php-src/ext/sqlite/sqlite.c diff -u php-src/ext/sqlite/sqlite.c:1.79 php-src/ext/sqlite/sqlite.c:1.80 --- php-src/ext/sqlite/sqlite.c:1.79 Sun Jul 20 14:05:03 2003 +++ php-src/ext/sqlite/sqlite.c Sun Aug 3 13:44:37 2003 @@ -17,7 +17,7 @@ | Marcus Boerger <[EMAIL PROTECTED]> | +----------------------------------------------------------------------+ - $Id: sqlite.c,v 1.79 2003/07/20 18:05:03 helly Exp $ + $Id: sqlite.c,v 1.80 2003/08/03 17:44:37 zeev Exp $ */ #ifdef HAVE_CONFIG_H @@ -66,8 +66,6 @@ extern int sqlite_encode_binary(const unsigned char *in, int n, unsigned char *out); extern int sqlite_decode_binary(const unsigned char *in, unsigned char *out); -static unsigned char arg3_force_ref[] = {3, BYREF_NONE, BYREF_NONE, BYREF_FORCE }; - static int le_sqlite_db, le_sqlite_result, le_sqlite_pdb; static inline void php_sqlite_strtoupper(char *s) @@ -165,8 +163,8 @@ enum { PHPSQLITE_ASSOC = 1, PHPSQLITE_NUM = 2, PHPSQLITE_BOTH = PHPSQLITE_ASSOC|PHPSQLITE_NUM }; function_entry sqlite_functions[] = { - PHP_FE(sqlite_open, arg3_force_ref) - PHP_FE(sqlite_popen, arg3_force_ref) + PHP_FE(sqlite_open, third_arg_force_ref) + PHP_FE(sqlite_popen, third_arg_force_ref) PHP_FE(sqlite_close, NULL) PHP_FE(sqlite_query, NULL) PHP_FE(sqlite_array_query, NULL) @@ -197,7 +195,7 @@ PHP_FE(sqlite_unbuffered_query, NULL) PHP_FE(sqlite_create_aggregate, NULL) PHP_FE(sqlite_create_function, NULL) - PHP_FE(sqlite_factory, arg3_force_ref) + PHP_FE(sqlite_factory, third_arg_force_ref) PHP_FE(sqlite_udf_encode_binary, NULL) PHP_FE(sqlite_udf_decode_binary, NULL) {NULL, NULL, NULL} @@ -949,7 +947,7 @@ { php_info_print_table_start(); php_info_print_table_header(2, "SQLite support", "enabled"); - php_info_print_table_row(2, "PECL Module version", PHP_SQLITE_MODULE_VERSION " $Id: sqlite.c,v 1.79 2003/07/20 18:05:03 helly Exp $"); + php_info_print_table_row(2, "PECL Module version", PHP_SQLITE_MODULE_VERSION " $Id: sqlite.c,v 1.80 2003/08/03 17:44:37 zeev Exp $"); php_info_print_table_row(2, "SQLite Library", sqlite_libversion()); php_info_print_table_row(2, "SQLite Encoding", sqlite_libencoding()); php_info_print_table_end(); Index: php-src/ext/standard/basic_functions.c diff -u php-src/ext/standard/basic_functions.c:1.618 php-src/ext/standard/basic_functions.c:1.619 --- php-src/ext/standard/basic_functions.c:1.618 Sat Aug 2 09:44:50 2003 +++ php-src/ext/standard/basic_functions.c Sun Aug 3 13:44:38 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.618 2003/08/02 13:44:50 helly Exp $ */ +/* $Id: basic_functions.c,v 1.619 2003/08/03 17:44:38 zeev Exp $ */ #include "php.h" #include "php_streams.h" @@ -99,14 +99,40 @@ #include "php_fopen_wrappers.h" #include "streamsfuncs.h" -static unsigned char first_and_second__args_force_ref[] = { 2, BYREF_FORCE, BYREF_FORCE }; -static unsigned char second_and_third_args_force_ref[] = { 3, BYREF_NONE, BYREF_FORCE, BYREF_FORCE }; -static unsigned char second_args_force_ref[] = { 2, BYREF_NONE, BYREF_FORCE }; -static unsigned char third_and_fourth_args_force_ref[] = { 4, BYREF_NONE, BYREF_NONE, BYREF_FORCE, BYREF_FORCE }; -static unsigned char third_and_rest_force_ref[] = { 3, BYREF_NONE, BYREF_NONE, BYREF_FORCE_REST }; -static unsigned char first_through_third_args_force_ref[] = {3, BYREF_FORCE, BYREF_FORCE, BYREF_FORCE}; -static unsigned char fourth_arg_force_ref[] = { 4, BYREF_NONE, BYREF_NONE, BYREF_NONE, BYREF_FORCE }; - +static + ZEND_BEGIN_ARG_INFO(first_and_second__args_force_ref, 0) + ZEND_ARG_PASS_INFO(1) + ZEND_ARG_PASS_INFO(1) + ZEND_END_ARG_INFO(); + +static + ZEND_BEGIN_ARG_INFO(second_and_third_args_force_ref, 0) + ZEND_ARG_PASS_INFO(0) + ZEND_ARG_PASS_INFO(1) + ZEND_ARG_PASS_INFO(1) + ZEND_END_ARG_INFO(); + +static + ZEND_BEGIN_ARG_INFO(third_and_fourth_args_force_ref, 0) + ZEND_ARG_PASS_INFO(0) + ZEND_ARG_PASS_INFO(0) + ZEND_ARG_PASS_INFO(1) + ZEND_ARG_PASS_INFO(1) + ZEND_END_ARG_INFO(); + +static + ZEND_BEGIN_ARG_INFO(third_and_rest_force_ref, 1) + ZEND_ARG_PASS_INFO(0) + ZEND_ARG_PASS_INFO(0) + ZEND_ARG_PASS_INFO(1) + ZEND_END_ARG_INFO(); + +static + ZEND_BEGIN_ARG_INFO(first_through_third_args_force_ref, 0) + ZEND_ARG_PASS_INFO(1) + ZEND_ARG_PASS_INFO(1) + ZEND_ARG_PASS_INFO(1) + ZEND_END_ARG_INFO(); typedef struct _php_shutdown_function_entry { zval **arguments; @@ -304,7 +330,7 @@ PHP_FE(iptcparse, NULL) PHP_FE(iptcembed, NULL) - PHP_FE(getimagesize, second_args_force_ref) + PHP_FE(getimagesize, second_arg_force_ref) PHP_FE(image_type_to_mime_type, NULL) PHP_FE(phpinfo, NULL) Index: php-src/ext/sysvmsg/sysvmsg.c diff -u php-src/ext/sysvmsg/sysvmsg.c:1.12 php-src/ext/sysvmsg/sysvmsg.c:1.13 --- php-src/ext/sysvmsg/sysvmsg.c:1.12 Sat Jul 19 15:23:33 2003 +++ php-src/ext/sysvmsg/sysvmsg.c Sun Aug 3 13:44:38 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sysvmsg.c,v 1.12 2003/07/19 19:23:33 andrey Exp $ */ +/* $Id: sysvmsg.c,v 1.13 2003/08/03 17:44:38 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -40,8 +40,27 @@ /* True global resources - no need for thread safety here */ static int le_sysvmsg; -static unsigned char sixth_arg_force_ref[] = { 6, BYREF_NONE, BYREF_NONE, BYREF_NONE, BYREF_NONE, BYREF_NONE, BYREF_FORCE }; -static unsigned char msg_receive_args_force_ref[] = { 8, BYREF_NONE, BYREF_NONE, BYREF_FORCE, BYREF_NONE, BYREF_FORCE, BYREF_NONE, BYREF_NONE, BYREF_FORCE }; +static + ZEND_BEGIN_ARG_INFO(sixth_arg_force_ref, 0) + ZEND_ARG_PASS_INFO(0) + ZEND_ARG_PASS_INFO(0) + ZEND_ARG_PASS_INFO(0) + ZEND_ARG_PASS_INFO(0) + ZEND_ARG_PASS_INFO(0) + ZEND_ARG_PASS_INFO(1) + ZEND_END_ARG_INFO(); + +static + ZEND_BEGIN_ARG_INFO(msg_receive_args_force_ref, 0) + ZEND_ARG_PASS_INFO(0) + ZEND_ARG_PASS_INFO(0) + ZEND_ARG_PASS_INFO(1) + ZEND_ARG_PASS_INFO(0) + ZEND_ARG_PASS_INFO(1) + ZEND_ARG_PASS_INFO(0) + ZEND_ARG_PASS_INFO(0) + ZEND_ARG_PASS_INFO(1) + ZEND_END_ARG_INFO(); /* {{{ sysvmsg_functions[] * @@ -120,7 +139,7 @@ { php_info_print_table_start(); php_info_print_table_row(2, "sysvmsg support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.12 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.13 $"); php_info_print_table_end(); } /* }}} */ Index: php-src/ext/xml/xml.c diff -u php-src/ext/xml/xml.c:1.136 php-src/ext/xml/xml.c:1.137 --- php-src/ext/xml/xml.c:1.136 Tue Jul 29 09:34:50 2003 +++ php-src/ext/xml/xml.c Sun Aug 3 13:44:38 2003 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xml.c,v 1.136 2003/07/29 13:34:50 rrichards Exp $ */ +/* $Id: xml.c,v 1.137 2003/08/03 17:44:38 zeev Exp $ */ #define IS_EXT_MODULE @@ -100,7 +100,13 @@ /* }}} */ /* {{{ extension definition structures */ -static unsigned char third_and_fourth_args_force_ref[] = { 4, BYREF_NONE, BYREF_NONE, BYREF_FORCE, BYREF_FORCE }; +static + ZEND_BEGIN_ARG_INFO(third_and_fourth_args_force_ref, 0) + ZEND_ARG_PASS_INFO(0) + ZEND_ARG_PASS_INFO(0) + ZEND_ARG_PASS_INFO(1) + ZEND_ARG_PASS_INFO(1) + ZEND_END_ARG_INFO(); function_entry xml_functions[] = { PHP_FE(xml_parser_create, NULL) Index: php-src/ext/xmlrpc/xmlrpc-epi-php.c diff -u php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.32 php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.33 --- php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.32 Sat Jul 19 15:11:01 2003 +++ php-src/ext/xmlrpc/xmlrpc-epi-php.c Sun Aug 3 13:44:38 2003 @@ -51,7 +51,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xmlrpc-epi-php.c,v 1.32 2003/07/19 19:11:01 andrey Exp $ */ +/* $Id: xmlrpc-epi-php.c,v 1.33 2003/08/03 17:44:38 zeev Exp $ */ /********************************************************************** * BUGS: * @@ -80,16 +80,13 @@ static int le_xmlrpc_server; -static unsigned char second_args_force_ref[] = { 3, BYREF_NONE, BYREF_FORCE, BYREF_NONE }; -static unsigned char first_args_force_ref[] = { 2, BYREF_FORCE, BYREF_NONE }; - function_entry xmlrpc_functions[] = { PHP_FE(xmlrpc_encode, NULL) PHP_FE(xmlrpc_decode, NULL) - PHP_FE(xmlrpc_decode_request, second_args_force_ref) + PHP_FE(xmlrpc_decode_request, second_arg_force_ref) PHP_FE(xmlrpc_encode_request, NULL) PHP_FE(xmlrpc_get_type, NULL) - PHP_FE(xmlrpc_set_type, first_args_force_ref) + PHP_FE(xmlrpc_set_type, first_arg_force_ref) PHP_FE(xmlrpc_is_fault, NULL) PHP_FE(xmlrpc_server_create, NULL) PHP_FE(xmlrpc_server_destroy, NULL) Index: php-src/ext/yaz/php_yaz.c diff -u php-src/ext/yaz/php_yaz.c:1.78 php-src/ext/yaz/php_yaz.c:1.79 --- php-src/ext/yaz/php_yaz.c:1.78 Wed Jul 30 05:53:37 2003 +++ php-src/ext/yaz/php_yaz.c Sun Aug 3 13:44:38 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_yaz.c,v 1.78 2003/07/30 09:53:37 dickmeiss Exp $ */ +/* $Id: php_yaz.c,v 1.79 2003/08/03 17:44:38 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -109,14 +109,11 @@ static int order_associations; static int le_link; -static unsigned char third_argument_force_ref[] = { 3, BYREF_NONE, BYREF_NONE, BYREF_FORCE }; -static unsigned char second_argument_force_ref[] = { 2, BYREF_NONE, BYREF_FORCE }; - function_entry yaz_functions [] = { PHP_FE(yaz_connect, NULL) PHP_FE(yaz_close, NULL) PHP_FE(yaz_search, NULL) - PHP_FE(yaz_wait, second_argument_force_ref) + PHP_FE(yaz_wait, second_arg_force_ref) PHP_FE(yaz_errno, NULL) PHP_FE(yaz_error, NULL) PHP_FE(yaz_addinfo, NULL) @@ -128,10 +125,10 @@ PHP_FE(yaz_itemorder, NULL) PHP_FE(yaz_es_result, NULL) PHP_FE(yaz_scan, NULL) - PHP_FE(yaz_scan_result, second_argument_force_ref) + PHP_FE(yaz_scan_result, second_arg_force_ref) PHP_FE(yaz_present, NULL) PHP_FE(yaz_ccl_conf, NULL) - PHP_FE(yaz_ccl_parse, third_argument_force_ref) + PHP_FE(yaz_ccl_parse, third_arg_force_ref) PHP_FE(yaz_database, NULL) PHP_FE(yaz_sort, NULL) PHP_FE(yaz_schema, NULL)
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php