From c34c7433eb3810d2a1db7aa03a5b966fa10ee631 Mon Sep 17 00:00:00 2001 From: Sascha Schumann Date: Sat, 19 Apr 2003 17:41:12 +0000 Subject: [PATCH] MFH --- ext/standard/info.c | 32 +++++++++++++++++++++++++++----- ext/standard/info.h | 1 + 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/ext/standard/info.c b/ext/standard/info.c index dbc043df04..0515904265 100644 --- a/ext/standard/info.c +++ b/ext/standard/info.c @@ -759,12 +759,12 @@ PHPAPI void php_info_print_table_header(int num_cols, ...) } /* }}} */ -/* {{{ php_info_print_table_row +/* {{{ php_info_print_table_row_internal */ -PHPAPI void php_info_print_table_row(int num_cols, ...) +static void php_info_print_table_row_internal(int num_cols, + const char *value_class, va_list row_elements) { int i; - va_list row_elements; char *row_element; char *elem_esc = NULL; /* @@ -773,14 +773,13 @@ PHPAPI void php_info_print_table_row(int num_cols, ...) TSRMLS_FETCH(); - va_start(row_elements, num_cols); if (!sapi_module.phpinfo_as_text) { php_printf(""); } for (i=0; i", - (i==0 ? "e" : "v" ) + (i==0 ? "e" : value_class ) ); } row_element = va_arg(row_elements, char *); @@ -811,7 +810,30 @@ PHPAPI void php_info_print_table_row(int num_cols, ...) if (!sapi_module.phpinfo_as_text) { php_printf("\n"); } +} +/* }}} */ + +/* {{{ php_info_print_table_row + */ +PHPAPI void php_info_print_table_row(int num_cols, ...) +{ + va_list row_elements; + + va_start(row_elements, num_cols); + php_info_print_table_row_internal(num_cols, "v", row_elements); + va_end(row_elements); +} +/* }}} */ + +/* {{{ php_info_print_table_row_ex + */ +PHPAPI void php_info_print_table_row_ex(int num_cols, const char *value_class, + ...) +{ + va_list row_elements; + va_start(row_elements, value_class); + php_info_print_table_row_internal(num_cols, value_class, row_elements); va_end(row_elements); } /* }}} */ diff --git a/ext/standard/info.h b/ext/standard/info.h index 69b65b364b..e898806f8d 100644 --- a/ext/standard/info.h +++ b/ext/standard/info.h @@ -72,6 +72,7 @@ PHPAPI void php_info_print_style(void); PHPAPI void php_info_print_table_colspan_header(int num_cols, char *header); PHPAPI void php_info_print_table_header(int num_cols, ...); PHPAPI void php_info_print_table_row(int num_cols, ...); +PHPAPI void php_info_print_table_row_ex(int num_cols, const char *, ...); PHPAPI void php_info_print_table_start(void); PHPAPI void php_info_print_table_end(void); PHPAPI void php_info_print_box_start(int bg); -- 2.40.0