cvs: php4 /ext/bcmath bcmath.c php_bcmath.h /ext/ftp php_ftp.c php_ftp.h /main internal_functions_win32.c

dbeu Sun Oct 8 04:45:18 2000 EDT Modified files: /php4/ext/bcmath bcmath.c php_bcmath.h /php4/ext/ftp php_ftp.c php_ftp.h /php4/main internal_functions_win32.c Log: more cleanup of info code Index: php4/ext/bcmath/bcmath.c diff -u php4/ext/bcmath/bcmath.c:1.22 php4/ext/bcmath/bcmath.c:1.23 --- php4/ext/bcmath/bcmath.c:1.22 Sun Jul 23 18:39:43 2000 +++ php4/ext/bcmath/bcmath.c Sun Oct 8 04:45:17 2000 @@ -16,13 +16,14 @@ +----------------------------------------------------------------------+ */ -/* $Id: bcmath.c,v 1.22 2000/07/24 01:39:43 david Exp $ */ +/* $Id: bcmath.c,v 1.23 2000/10/08 11:45:17 dbeu Exp $ */ #include "php.h" #if WITH_BCMATH #include "number.h" +#include "ext/standard/info.h" #include "php_bcmath.h" function_entry bcmath_functions[] = { @@ -39,7 +40,14 @@ }; zend_module_entry bcmath_module_entry = { - "bcmath", bcmath_functions, NULL, NULL, PHP_RINIT(bcmath), PHP_RSHUTDOWN(bcmath), NULL, STANDARD_MODULE_PROPERTIES + "bcmath", + bcmath_functions, + NULL, + NULL, + PHP_RINIT(bcmath), + PHP_RSHUTDOWN(bcmath), + PHP_MINFO(bcmath), + STANDARD_MODULE_PROPERTIES }; #ifdef COMPILE_DL_BCMATH @@ -63,6 +71,13 @@ { destruct_numbers(); return SUCCESS; +} + +PHP_MINFO_FUNCTION(bcmath) +{ + php_info_print_table_start(); + php_info_print_table_row(2, "BCMath support", "enabled"); + php_info_print_table_end(); } /* {{{ proto string bcadd(string left_operand, string right_operand [, int scale]) Index: php4/ext/bcmath/php_bcmath.h diff -u php4/ext/bcmath/php_bcmath.h:1.5 php4/ext/bcmath/php_bcmath.h:1.6 --- php4/ext/bcmath/php_bcmath.h:1.5 Sun Jul 23 18:39:43 2000 +++ php4/ext/bcmath/php_bcmath.h Sun Oct 8 04:45:17 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_bcmath.h,v 1.5 2000/07/24 01:39:43 david Exp $ */ +/* $Id: php_bcmath.h,v 1.6 2000/10/08 11:45:17 dbeu Exp $ */ #ifndef PHP_BCMATH_H #define PHP_BCMATH_H @@ -28,6 +28,8 @@ extern PHP_RINIT_FUNCTION(bcmath); extern PHP_RSHUTDOWN_FUNCTION(bcmath); +PHP_MINFO_FUNCTION(bcmath); + PHP_FUNCTION(bcadd); PHP_FUNCTION(bcsub); PHP_FUNCTION(bcmul); Index: php4/ext/ftp/php_ftp.c diff -u php4/ext/ftp/php_ftp.c:1.27 php4/ext/ftp/php_ftp.c:1.28 --- php4/ext/ftp/php_ftp.c:1.27 Wed Sep 13 15:00:31 2000 +++ php4/ext/ftp/php_ftp.c Sun Oct 8 04:45:17 2000 @@ -28,12 +28,13 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_ftp.c,v 1.27 2000/09/13 22:00:31 derick Exp $ */ +/* $Id: php_ftp.c,v 1.28 2000/10/08 11:45:17 dbeu Exp $ */ #include "php.h" #if HAVE_FTP +#include "ext/standard/info.h" #include "ext/standard/file.h" #include "php_ftp.h" @@ -75,7 +76,7 @@ NULL, NULL, NULL, - NULL, + PHP_MINFO(ftp), STANDARD_MODULE_PROPERTIES }; @@ -100,6 +101,13 @@ REGISTER_MAIN_LONG_CONSTANT("FTP_TEXT", FTPTYPE_ASCII, CONST_PERSISTENT | CONST_CS); return SUCCESS; +} + +PHP_MINFO_FUNCTION(ftp) +{ + php_info_print_table_start(); + php_info_print_table_row(2, "FTP support", "enabled"); + php_info_print_table_end(); } Index: php4/ext/ftp/php_ftp.h diff -u php4/ext/ftp/php_ftp.h:1.11 php4/ext/ftp/php_ftp.h:1.12 --- php4/ext/ftp/php_ftp.h:1.11 Wed Sep 13 15:00:31 2000 +++ php4/ext/ftp/php_ftp.h Sun Oct 8 04:45:17 2000 @@ -28,7 +28,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_ftp.h,v 1.11 2000/09/13 22:00:31 derick Exp $ */ +/* $Id: php_ftp.h,v 1.12 2000/10/08 11:45:17 dbeu Exp $ */ #ifndef _INCLUDED_FTP_H #define _INCLUDED_FTP_H @@ -39,6 +39,7 @@ #define php_ftp_module_ptr &php_ftp_module_entry PHP_MINIT_FUNCTION(ftp); +PHP_MINFO_FUNCTION(ftp); PHP_FUNCTION(ftp_connect); PHP_FUNCTION(ftp_login); Index: php4/main/internal_functions_win32.c diff -u php4/main/internal_functions_win32.c:1.33 php4/main/internal_functions_win32.c:1.34 --- php4/main/internal_functions_win32.c:1.33 Thu Oct 5 17:03:02 2000 +++ php4/main/internal_functions_win32.c Sun Oct 8 04:45:18 2000 @@ -18,7 +18,7 @@ */ -/* $Id: internal_functions_win32.c,v 1.33 2000/10/06 00:03:02 andi Exp $ */ +/* $Id: internal_functions_win32.c,v 1.34 2000/10/08 11:45:18 dbeu Exp $ */ #include "php.h" @@ -64,19 +64,19 @@ /* #include "dl/snmp/php_snmp.h" */ zend_module_entry *php_builtin_extensions[] = { + phpext_standard_ptr, #if WITH_BCMATH phpext_bcmath_ptr, #endif - phpext_standard_ptr, phpext_calendar_ptr, COM_module_ptr, phpext_ftp_ptr, - phpext_pcre_ptr, + phpext_mysql_ptr, phpext_odbc_ptr, + phpext_pcre_ptr, phpext_session_ptr, phpext_xml_ptr, - phpext_wddx_ptr, - phpext_mysql_ptr + phpext_wddx_ptr }; #define EXTCOUNT (sizeof(php_builtin_extensions)/sizeof(zend_module_entry *))