cvs: php4(PHP_4_3) /ext/standard info.c info.h

sas Sat Apr 19 13:41:12 2003 EDT Modified files: (Branch: PHP_4_3) /php4/ext/standard info.c info.h Log: MFH Index: php4/ext/standard/info.c diff -u php4/ext/standard/info.c:1.218.2.9 php4/ext/standard/info.c:1.218.2.10 --- php4/ext/standard/info.c:1.218.2.9 Wed Apr 9 16:27:55 2003 +++ php4/ext/standard/info.c Sat Apr 19 13:41:12 2003 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: info.c,v 1.218.2.9 2003/04/09 20:27:55 helly Exp $ */ +/* $Id: info.c,v 1.218.2.10 2003/04/19 17:41:12 sas Exp $ */ #include "php.h" #include "php_ini.h" @@ -759,12 +759,12 @@ } /* }}} */ -/* {{{ 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 @@ TSRMLS_FETCH(); - va_start(row_elements, num_cols); if (!sapi_module.phpinfo_as_text) { php_printf("<tr>"); } for (i=0; i<num_cols; i++) { if (!sapi_module.phpinfo_as_text) { php_printf("<td class=\"%s\">", - (i==0 ? "e" : "v" ) + (i==0 ? "e" : value_class ) ); } row_element = va_arg(row_elements, char *); @@ -811,7 +810,30 @@ if (!sapi_module.phpinfo_as_text) { php_printf("</tr>\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); } /* }}} */ Index: php4/ext/standard/info.h diff -u php4/ext/standard/info.h:1.29.2.1 php4/ext/standard/info.h:1.29.2.2 --- php4/ext/standard/info.h:1.29.2.1 Tue Dec 31 11:35:31 2002 +++ php4/ext/standard/info.h Sat Apr 19 13:41:12 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: info.h,v 1.29.2.1 2002/12/31 16:35:31 sebastian Exp $ */ +/* $Id: info.h,v 1.29.2.2 2003/04/19 17:41:12 sas Exp $ */ #ifndef INFO_H #define INFO_H @@ -72,6 +72,7 @@ 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);