sebastian Thu Sep 26 15:48:56 2002 EDT
Modified files:
/php4/ext/standard credits.c info.c info.h
Log:
Fix ZTS build.
Index: php4/ext/standard/credits.c
diff -u php4/ext/standard/credits.c:1.19 php4/ext/standard/credits.c:1.20
--- php4/ext/standard/credits.c:1.19 Thu Sep 26 15:33:21 2002
+++ php4/ext/standard/credits.c Thu Sep 26 15:48:56 2002
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: credits.c,v 1.19 2002/09/26 19:33:21 cmv Exp $ */
+/* $Id: credits.c,v 1.20 2002/09/26 19:48:56 sebastian Exp $ */
#include "php.h"
#include "info.h"
@@ -31,7 +31,7 @@
TSRMLS_FETCH();
if (flag & PHP_CREDITS_FULLPAGE) {
- php_print_info_htmlhead();
+ php_print_info_htmlhead(TSRMLS_C);
}
PUTS("<h1>PHP Credits</h1>\n");
Index: php4/ext/standard/info.c
diff -u php4/ext/standard/info.c:1.206 php4/ext/standard/info.c:1.207
--- php4/ext/standard/info.c:1.206 Thu Sep 26 15:33:21 2002
+++ php4/ext/standard/info.c Thu Sep 26 15:48:56 2002
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: info.c,v 1.206 2002/09/26 19:33:21 cmv Exp $ */
+/* $Id: info.c,v 1.207 2002/09/26 19:48:56 sebastian Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -115,7 +115,7 @@
switch (zend_hash_get_current_key_ex(Z_ARRVAL_PP(data),
&string_key, &string_len, &num_key, 0, NULL)) {
case HASH_KEY_IS_STRING:
if (PG(html_errors)) {
- PUTS(php_info_html_esc( string_key ));
+ PUTS(php_info_html_esc(string_key
+TSRMLS_CC));
} else {
PUTS(string_key);
}
@@ -146,7 +146,7 @@
if (Z_STRLEN(tmp2) == 0) {
PUTS("<i>no value</i>");
} else {
- PUTS(php_info_html_esc( Z_STRVAL(tmp2)
));
+ PUTS(php_info_html_esc(Z_STRVAL(tmp2)
+TSRMLS_CC));
}
} else {
PUTS(Z_STRVAL(tmp2));
@@ -157,7 +157,7 @@
if (Z_STRLEN_PP(tmp) == 0) {
PUTS("<i>no value</i>");
} else {
- PUTS(php_info_html_esc(
Z_STRVAL_PP(tmp) ));
+
+PUTS(php_info_html_esc(Z_STRVAL_PP(tmp) TSRMLS_CC));
}
} else {
PUTS(Z_STRVAL_PP(tmp));
@@ -187,10 +187,10 @@
/* {{{ php_info_html_esc
*/
-PHPAPI char *php_info_html_esc(char *string)
+PHPAPI char *php_info_html_esc(char *string TSRMLS_DC)
{
int new_len;
- return php_escape_html_entities(string, strlen(string), &new_len, 1,
ENT_COMPAT, NULL);
+ return php_escape_html_entities(string, strlen(string), &new_len, 1,
+ENT_COMPAT, NULL TSRMLS_CC);
}
/* }}} */
@@ -274,7 +274,7 @@
/* {{{ php_print_info_htmlhead
*/
-PHPAPI void php_print_info_htmlhead()
+PHPAPI void php_print_info_htmlhead(TSRMLS_D)
{
const char *charset = NULL;
@@ -328,7 +328,7 @@
ta = php_localtime_r(&the_time, &tmbuf);
if (PG(html_errors)) {
- php_print_info_htmlhead();
+ php_print_info_htmlhead(TSRMLS_C);
} else {
PUTS(" _ _ __ ____ \n");
PUTS(" _ __ | |__ _ __ (_)_ __ / _| ___ / /\\ \\ \n");
@@ -672,7 +672,7 @@
}
if (PG(html_errors)) {
PUTS("<th>");
- PUTS(php_info_html_esc( row_element ));
+ PUTS(php_info_html_esc(row_element TSRMLS_CC));
PUTS("</th>");
} else {
PUTS(row_element);
@@ -724,7 +724,7 @@
}
} else {
if (PG(html_errors)) {
- PUTS(php_info_html_esc( row_element ));
+ PUTS(php_info_html_esc(row_element TSRMLS_CC));
} else {
PUTS(row_element);
if (i < num_cols-1) {
Index: php4/ext/standard/info.h
diff -u php4/ext/standard/info.h:1.27 php4/ext/standard/info.h:1.28
--- php4/ext/standard/info.h:1.27 Thu Sep 26 15:33:23 2002
+++ php4/ext/standard/info.h Thu Sep 26 15:48:56 2002
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: info.h,v 1.27 2002/09/26 19:33:23 cmv Exp $ */
+/* $Id: info.h,v 1.28 2002/09/26 19:48:56 sebastian Exp $ */
#ifndef INFO_H
#define INFO_H
@@ -63,8 +63,8 @@
PHP_FUNCTION(php_egg_logo_guid);
PHP_FUNCTION(php_sapi_name);
PHP_FUNCTION(php_uname);
-PHPAPI char *php_info_html_esc(char *string);
-PHPAPI void php_print_info_htmlhead(void);
+PHPAPI char *php_info_html_esc(char *string TSRMLS_DC);
+PHPAPI void php_print_info_htmlhead(TSRMLS_D);
PHPAPI void php_print_info(int flag TSRMLS_DC);
PHPAPI void php_print_style(void);
PHPAPI void php_info_print_style(void);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
