andrei Thu Nov 14 16:15:43 2002 EDT
Modified files:
/php4/ext/standard info.c
Log:
Sort the modules for info output as well.
Index: php4/ext/standard/info.c
diff -u php4/ext/standard/info.c:1.218 php4/ext/standard/info.c:1.219
--- php4/ext/standard/info.c:1.218 Thu Oct 24 09:14:43 2002
+++ php4/ext/standard/info.c Thu Nov 14 16:15:42 2002
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: info.c,v 1.218 2002/10/24 13:14:43 sas Exp $ */
+/* $Id: info.c,v 1.219 2002/11/14 21:15:42 andrei Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -326,6 +326,16 @@
}
/* }}} */
+/* {{{ module_name_cmp */
+static int module_name_cmp(const void *a, const void *b TSRMLS_DC)
+{
+ Bucket *f = *((Bucket **) a);
+ Bucket *s = *((Bucket **) b);
+
+ return strcmp(((zend_module_entry *)f->pData)->name,
+ ((zend_module_entry *)s->pData)->name);
+}
+/* }}} */
/* {{{ php_print_info
*/
@@ -497,16 +507,24 @@
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_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(&module_registry, (apply_func_arg_t)
_display_module_info, &show_info_func TSRMLS_CC);
+ zend_hash_apply_with_argument(&sorted_registry, (apply_func_arg_t)
+_display_module_info, &show_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(&module_registry, (apply_func_arg_t)
_display_module_info, &show_info_func TSRMLS_CC);
+ zend_hash_apply_with_argument(&sorted_registry, (apply_func_arg_t)
+_display_module_info, &show_info_func TSRMLS_CC);
php_info_print_table_end();
+
+ zend_hash_destroy(&sorted_registry);
}
if (flag & PHP_INFO_ENVIRONMENT) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
