Remove unnecessary code, fix phpinfo()

diff --git a/Zend/zend_ini.c b/Zend/zend_ini.c
index 4c48209c744849e50d71bd600f52449eed5f871e..c72d0795f04280e237aa094d2658a15524f2cc6b 100644 (file)
--- a/Zend/zend_ini.c
+++ b/Zend/zend_ini.c
@@ -375,42 +375,10 @@ ZEND_INI_DISP(display_link_numbers)
 }
 
 
-#if 0
-static int zend_ini_displayer(zend_ini_entry *ini_entry, int module_number)
+ZEND_API zend_ini_apply_with_argument(apply_func_arg_t apply_func, void *arg)
 {
-       if (ini_entry->module_number != module_number) {
-               return 0;
-       }
-
-       ZEND_PUTS("<TR VALIGN=\"baseline\" BGCOLOR=\"" ZEND_CONTENTS_COLOR "\">");
-       ZEND_PUTS("<TD BGCOLOR=\"" ZEND_ENTRY_NAME_COLOR "\"><B>");
-       ZEND_WRITE(ini_entry->name, ini_entry->name_length-1);
-       ZEND_PUTS("</B><BR></TD><TD ALIGN=\"center\">");
-       zend_ini_displayer_cb(ini_entry, ZEND_INI_DISPLAY_ACTIVE);
-       ZEND_PUTS("</TD><TD ALIGN=\"center\">");
-       zend_ini_displayer_cb(ini_entry, ZEND_INI_DISPLAY_ORIG);
-       ZEND_PUTS("</TD></TR>\n");
-       return 0;
-}
-
-
-ZEND_API void display_ini_entries(zend_module_entry *module)
-{
-       int module_number;
-
-       if (module) {
-               module_number = module->module_number;
-       } else {
-               module_number = 0;
-       }
-#if 0 /* FIXME */
-       php_info_print_table_start();
-       php_info_print_table_header(3, "Directive", "Local Value", "Master Value");
-       zend_hash_apply_with_argument(&known_directives, (int (*)(void *, void *)) zend_ini_displayer, (void *) (long) module_number);
-       php_info_print_table_end();
-#endif
+       zend_hash_apply_with_argument(&known_directives, apply_func, arg);
 }
-#endif
 
 
 /* Standard message handlers */
@@ -508,6 +476,7 @@ ZEND_API ZEND_INI_MH(OnUpdateStringUnempty)
        return SUCCESS;
 }
 
+
 /*
  * Local variables:
  * tab-width: 4

diff --git a/Zend/zend_ini.h b/Zend/zend_ini.h
index 3411eef40e0c79bdfdaa86c570948c532f0b7ced..d2a7b8c135d3279bf84a0576174b4396b4ec8f68 100644 (file)
--- a/Zend/zend_ini.h
+++ b/Zend/zend_ini.h
@@ -71,6 +71,9 @@ ZEND_API char *zend_ini_string(char *name, uint name_length, int orig);
 zend_ini_entry *get_ini_entry(char *name, uint name_length);
 
 ZEND_API int zend_ini_register_displayer(char *name, uint name_length, void (*displayer)(zend_ini_entry *ini_entry, int type));
+
+ZEND_API zend_ini_apply_with_argument(apply_func_arg_t apply_func, void *arg);
+
 ZEND_API ZEND_INI_DISP(zend_ini_boolean_displayer_cb);
 ZEND_API ZEND_INI_DISP(zend_ini_color_displayer_cb);
 ZEND_API ZEND_INI_DISP(display_link_numbers);