From 19c93586a01242be5a6f5f848d70ee0b476ef797 Mon Sep 17 00:00:00 2001
From: Marcus Boerger <helly@php.net>
Date: Tue, 23 Jan 2007 19:58:45 +0000
Subject: [PATCH] - Simplify - Add PHPAPI php_info_print_module()

---
 ext/standard/info.c | 38 ++++++++++++++++++++++++--------------
 ext/standard/info.h |  1 +
 2 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/ext/standard/info.c b/ext/standard/info.c
index bbf9bbb57f..0c84338f2b 100644
--- a/ext/standard/info.c
+++ b/ext/standard/info.c
@@ -174,13 +174,9 @@ static void php_info_print_stream_hash(const char *name, HashTable *ht TSRMLS_DC
 	}
 }
  
-/* {{{ _display_module_info
-*/
-static int _display_module_info(zend_module_entry *module, void *arg TSRMLS_DC)
+PHPAPI void php_info_print_module(zend_module_entry *module TSRMLS_DC) /* {{{ */
 {
-	int show_info_func = *((int *) arg);
-
-	if (show_info_func && module->info_func) {
+	if (module->info_func) {
 		if (!sapi_module.phpinfo_as_text) {
 			php_info_printf("<h2><a name=\"module_%s\">%s</a></h2>\n", module->name, module->name);
 		} else {
@@ -189,7 +185,7 @@ static int _display_module_info(zend_module_entry *module, void *arg TSRMLS_DC)
 			php_info_print_table_end();
 		}
 		module->info_func(module TSRMLS_CC);
-	} else if (!show_info_func && !module->info_func) {
+	} else {
 		if (!sapi_module.phpinfo_as_text) {
 			php_info_printf("<tr>");
 			php_info_printf("<td>");
@@ -200,7 +196,24 @@ static int _display_module_info(zend_module_entry *module, void *arg TSRMLS_DC)
 			php_info_printf("\n");
 		}	
 	}
-	return 0;
+}
+/* }}}*/
+
+static int _display_module_info_func(zend_module_entry *module TSRMLS_DC) /* {{{ */
+{
+	if (module->info_func) {
+		php_info_print_module(module TSRMLS_CC);
+	}
+	return ZEND_HASH_APPLY_KEEP;
+}
+/* }}} */
+
+static int _display_module_info_def(zend_module_entry *module TSRMLS_DC) /* {{{ */
+{
+	if (!module->info_func) {
+		php_info_print_module(module TSRMLS_CC);
+	}
+	return ZEND_HASH_APPLY_KEEP;
 }
 /* }}} */
 
@@ -607,22 +620,19 @@ PHPAPI void php_print_info(int flag TSRMLS_DC)
 	}
 
 	if (flag & PHP_INFO_MODULES) {
-		int show_info_func;
 		HashTable sorted_registry;
 		zend_module_entry tmp;
 
-		zend_hash_init(&sorted_registry, 50, NULL, NULL, 1);
+		zend_hash_init(&sorted_registry, zend_hash_num_elements(&module_registry), NULL, NULL, 1);
 		zend_hash_copy(&sorted_registry, &module_registry, NULL, &tmp, sizeof(zend_module_entry));
 		zend_hash_sort(&sorted_registry, zend_qsort, module_name_cmp, 0 TSRMLS_CC);
 
-		show_info_func = 1;
-		zend_hash_apply_with_argument(&sorted_registry, (apply_func_arg_t) _display_module_info, &show_info_func TSRMLS_CC);
+		zend_hash_apply(&sorted_registry, (apply_func_t) _display_module_info_func TSRMLS_CC);
 
 		SECTION("Additional Modules");
 		php_info_print_table_start();
 		php_info_print_table_header(1, "Module Name");
-		show_info_func = 0;
-		zend_hash_apply_with_argument(&sorted_registry, (apply_func_arg_t) _display_module_info, &show_info_func TSRMLS_CC);
+		zend_hash_apply(&sorted_registry, (apply_func_t) _display_module_info_def TSRMLS_CC);
 		php_info_print_table_end();
 
 		zend_hash_destroy(&sorted_registry);
diff --git a/ext/standard/info.h b/ext/standard/info.h
index 996339b9b9..32ed936d48 100644
--- a/ext/standard/info.h
+++ b/ext/standard/info.h
@@ -81,6 +81,7 @@ PHPAPI void php_info_print_table_end(void);
 PHPAPI void php_info_print_box_start(int bg);
 PHPAPI void php_info_print_box_end(void);
 PHPAPI void php_info_print_hr(void);
+PHPAPI void php_info_print_module(zend_module_entry *module TSRMLS_DC);
 PHPAPI char *php_logo_guid(void);
 PHPAPI char *php_get_uname(char mode);
 
-- 
2.40.0