mirror of
https://github.com/php/php-src.git
synced 2024-09-22 02:17:32 +00:00
- Fix a buglet in printing of GPCSE arrays
- Remove indirect access
This commit is contained in:
parent
1668570e4d
commit
1bfb3595a8
@ -80,7 +80,7 @@ static void php_print_gpcse_array(char *name, uint name_length TSRMLS_DC)
|
||||
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 @@ static void php_print_gpcse_array(char *name, uint name_length TSRMLS_DC)
|
||||
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(" </td></tr>\n");
|
||||
zend_hash_move_forward(Z_ARRVAL_PP(data));
|
||||
@ -291,7 +291,7 @@ PHPAPI void php_print_info(int flag TSRMLS_DC)
|
||||
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 @@ PHPAPI void php_info_print_table_row(int num_cols, ...)
|
||||
if (!row_element || !*row_element) {
|
||||
php_printf(" ");
|
||||
} 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>":""));
|
||||
|
Loading…
Reference in New Issue
Block a user