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

sas Mon Apr 21 23:27:02 2003 EDT Modified files: (Branch: PHP_4_3) /php4/ext/standard info.c info.h Log: Drop php_info_print_table_row_ex from the 4.3 branch Index: php4/ext/standard/info.c diff -u php4/ext/standard/info.c:1.218.2.10 php4/ext/standard/info.c:1.218.2.11 --- php4/ext/standard/info.c:1.218.2.10 Sat Apr 19 13:41:12 2003 +++ php4/ext/standard/info.c Mon Apr 21 23:27:01 2003 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: info.c,v 1.218.2.10 2003/04/19 17:41:12 sas Exp $ */ +/* $Id: info.c,v 1.218.2.11 2003/04/22 03:27:01 sas Exp $ */ #include "php.h" #include "php_ini.h" @@ -759,12 +759,12 @@ } /* }}} */ -/* {{{ php_info_print_table_row_internal +/* {{{ php_info_print_table_row */ -static void php_info_print_table_row_internal(int num_cols, - const char *value_class, va_list row_elements) +PHPAPI void php_info_print_table_row(int num_cols, ...) { int i; + va_list row_elements; char *row_element; char *elem_esc = NULL; /* @@ -773,13 +773,14 @@ 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" : value_class ) + (i==0 ? "e" : "v" ) ); } row_element = va_arg(row_elements, char *); @@ -810,30 +811,7 @@ 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.2 php4/ext/standard/info.h:1.29.2.3 --- php4/ext/standard/info.h:1.29.2.2 Sat Apr 19 13:41:12 2003 +++ php4/ext/standard/info.h Mon Apr 21 23:27:01 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: info.h,v 1.29.2.2 2003/04/19 17:41:12 sas Exp $ */ +/* $Id: info.h,v 1.29.2.3 2003/04/22 03:27:01 sas Exp $ */ #ifndef INFO_H #define INFO_H @@ -72,7 +72,6 @@ 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);