cvs: php4 /ext/standard info.c

zeev Mon May 13 13:43:04 2002 EDT Modified files: /php4/ext/standard info.c Log: - Fix a buglet in printing of GPCSE arrays - Remove indirect access Index: php4/ext/standard/info.c diff -u php4/ext/standard/info.c:1.179 php4/ext/standard/info.c:1.180 --- php4/ext/standard/info.c:1.179 Mon May 13 04:46:21 2002 +++ php4/ext/standard/info.c Mon May 13 13:43:04 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: info.c,v 1.179 2002/05/13 08:46:21 zeev Exp $ */ +/* $Id: info.c,v 1.180 2002/05/13 17:43:04 zeev Exp $ */ #include "php.h" #include "php_ini.h" @@ -80,7 +80,7 @@ PUTS("[\""); switch (zend_hash_get_current_key_ex(Z_ARRVAL_PP(data), &string_key, &string_len, &num_key, 0, NULL)) { case HASH_KEY_IS_STRING: - php_html_puts(string_key, string_len TSRMLS_CC); + zend_html_puts(string_key, string_len-1); break; case HASH_KEY_IS_LONG: php_printf("%ld", num_key); @@ -95,10 +95,10 @@ tmp2 = **tmp; zval_copy_ctor(&tmp2); convert_to_string(&tmp2); - php_html_puts(Z_STRVAL(tmp2), Z_STRLEN(tmp2) TSRMLS_CC); + zend_html_puts(Z_STRVAL(tmp2), Z_STRLEN(tmp2)); zval_dtor(&tmp2); } else { - php_html_puts(Z_STRVAL_PP(tmp), Z_STRLEN_PP(tmp) TSRMLS_CC); + zend_html_puts(Z_STRVAL_PP(tmp), Z_STRLEN_PP(tmp)); } PUTS("&nbsp;</td></tr>\n"); zend_hash_move_forward(Z_ARRVAL_PP(data)); @@ -291,7 +291,7 @@ PUTS("?="ZEND_LOGO_GUID"\" border=\"0\" align=\"right\" alt=\"Zend logo\"></a>\n"); } php_printf("This program makes use of the Zend Scripting Language Engine:<br />"); - php_html_puts(zend_version, strlen(zend_version) TSRMLS_CC); + zend_html_puts(zend_version, strlen(zend_version)); php_info_print_box_end(); efree(php_uname); } @@ -483,7 +483,7 @@ if (!row_element || !*row_element) { php_printf("&nbsp;"); } else { - php_html_puts(row_element, strlen(row_element) TSRMLS_CC); + zend_html_puts(row_element, strlen(row_element)); } php_printf("%s</td>", (i==0?"</b>":""));