sebastian Thu Sep 26 14:13:32 2002 EDT
Modified files:
/php4/ext/standard html.c html.h
/php4/ext/wddx php_wddx_api.h wddx.c
Log:
Fix ZTS build.
Index: php4/ext/standard/html.c
diff -u php4/ext/standard/html.c:1.52 php4/ext/standard/html.c:1.53
--- php4/ext/standard/html.c:1.52 Thu Sep 26 12:07:14 2002
+++ php4/ext/standard/html.c Thu Sep 26 14:13:32 2002
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: html.c,v 1.52 2002/09/26 16:07:14 wez Exp $ */
+/* $Id: html.c,v 1.53 2002/09/26 18:13:32 sebastian Exp $ */
#include "php.h"
#include "reg.h"
@@ -595,12 +595,12 @@
/* {{{ php_unescape_html_entities
*/
-PHPAPI char *php_unescape_html_entities(unsigned char *old, int oldlen, int *newlen,
int all, int quote_style, char *hint_charset)
+PHPAPI char *php_unescape_html_entities(unsigned char *old, int oldlen, int *newlen,
+int all, int quote_style, char *hint_charset TSRMLS_DC)
{
int retlen;
int j, k;
char *replaced, *ret;
- enum entity_charset charset = determine_charset(hint_charset);
+ enum entity_charset charset = determine_charset(hint_charset TSRMLS_CC);
unsigned char replacement[15];
ret = estrdup(old);
@@ -663,11 +663,11 @@
/* {{{ php_escape_html_entities
*/
-PHPAPI char *php_escape_html_entities(unsigned char *old, int oldlen, int *newlen,
int all, int quote_style, char *hint_charset)
+PHPAPI char *php_escape_html_entities(unsigned char *old, int oldlen, int *newlen,
+int all, int quote_style, char *hint_charset TSRMLS_DC)
{
int i, j, maxlen, len;
char *replaced;
- enum entity_charset charset = determine_charset(hint_charset);
+ enum entity_charset charset = determine_charset(hint_charset TSRMLS_CC);
int matches_map;
maxlen = 2 * oldlen;
@@ -766,7 +766,7 @@
return;
}
- replaced = php_escape_html_entities(str, str_len, &len, all, quote_style,
hint_charset);
+ replaced = php_escape_html_entities(str, str_len, &len, all, quote_style,
+hint_charset TSRMLS_CC);
RETVAL_STRINGL(replaced, len, 0);
}
/* }}} */
@@ -807,7 +807,7 @@
return;
}
- replaced = php_unescape_html_entities(str, str_len, &len, 1, quote_style,
hint_charset);
+ replaced = php_unescape_html_entities(str, str_len, &len, 1, quote_style,
+hint_charset TSRMLS_CC);
RETVAL_STRINGL(replaced, len, 0);
}
/* }}} */
@@ -828,7 +828,7 @@
int which = HTML_SPECIALCHARS, quote_style = ENT_COMPAT;
int i, j;
char ind[2];
- enum entity_charset charset = determine_charset(NULL);
+ enum entity_charset charset = determine_charset(NULL TSRMLS_CC);
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|ll", &which,
"e_style) == FAILURE) {
return;
Index: php4/ext/standard/html.h
diff -u php4/ext/standard/html.h:1.14 php4/ext/standard/html.h:1.15
--- php4/ext/standard/html.h:1.14 Fri Mar 15 20:34:52 2002
+++ php4/ext/standard/html.h Thu Sep 26 14:13:32 2002
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: html.h,v 1.14 2002/03/16 01:34:52 wez Exp $ */
+/* $Id: html.h,v 1.15 2002/09/26 18:13:32 sebastian Exp $ */
#ifndef HTML_H
#define HTML_H
@@ -36,6 +36,6 @@
PHP_FUNCTION(html_entity_decode);
PHP_FUNCTION(get_html_translation_table);
-PHPAPI char *php_escape_html_entities(unsigned char *old, int oldlen, int *newlen,
int all, int quote_style, char *hint_charset);
+PHPAPI char *php_escape_html_entities(unsigned char *old, int oldlen, int *newlen,
+int all, int quote_style, char *hint_charset TSRMLS_DC);
#endif /* HTML_H */
Index: php4/ext/wddx/php_wddx_api.h
diff -u php4/ext/wddx/php_wddx_api.h:1.16 php4/ext/wddx/php_wddx_api.h:1.17
--- php4/ext/wddx/php_wddx_api.h:1.16 Tue Dec 11 10:30:50 2001
+++ php4/ext/wddx/php_wddx_api.h Thu Sep 26 14:13:32 2002
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_wddx_api.h,v 1.16 2001/12/11 15:30:50 sebastian Exp $ */
+/* $Id: php_wddx_api.h,v 1.17 2002/09/26 18:13:32 sebastian Exp $ */
#ifndef PHP_WDDX_API_H
#define PHP_WDDX_API_H
@@ -59,7 +59,7 @@
void php_wddx_packet_start(wddx_packet *packet, char *comment, int
comment_len);
void php_wddx_packet_end(wddx_packet *packet);
-void php_wddx_serialize_var(wddx_packet *packet, zval *var, char *name,
int name_len);
+void php_wddx_serialize_var(wddx_packet *packet, zval *var, char *name,
+int name_len TSRMLS_DC);
int php_wddx_deserialize_ex(char *, int, zval *return_value);
#define php_wddx_gather(packet) estrndup(packet->c, packet->len)
Index: php4/ext/wddx/wddx.c
diff -u php4/ext/wddx/wddx.c:1.93 php4/ext/wddx/wddx.c:1.94
--- php4/ext/wddx/wddx.c:1.93 Wed Jul 17 15:27:36 2002
+++ php4/ext/wddx/wddx.c Thu Sep 26 14:13:32 2002
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: wddx.c,v 1.93 2002/07/17 19:27:36 andrei Exp $ */
+/* $Id: wddx.c,v 1.94 2002/09/26 18:13:32 sebastian Exp $ */
#include "php.h"
#include "php_wddx.h"
@@ -240,7 +240,7 @@
php_wddx_add_chunk_static(packet, WDDX_STRUCT_S);
PS_ENCODE_LOOP(
- php_wddx_serialize_var(packet, *struc, key, key_length);
+ php_wddx_serialize_var(packet, *struc, key, key_length TSRMLS_CC);
);
php_wddx_add_chunk_static(packet, WDDX_STRUCT_E);
@@ -495,7 +495,7 @@
}
if (zend_hash_find(HASH_OF(obj), Z_STRVAL_PP(varname),
Z_STRLEN_PP(varname)+1, (void **)&ent) == SUCCESS) {
- php_wddx_serialize_var(packet, *ent,
Z_STRVAL_PP(varname), Z_STRLEN_PP(varname));
+ php_wddx_serialize_var(packet, *ent,
+Z_STRVAL_PP(varname), Z_STRLEN_PP(varname) TSRMLS_CC);
}
}
@@ -525,10 +525,10 @@
continue;
if (zend_hash_get_current_key_ex(HASH_OF(obj), &key, &key_len,
&idx, 0, NULL) == HASH_KEY_IS_STRING) {
- php_wddx_serialize_var(packet, *ent, key, key_len);
+ php_wddx_serialize_var(packet, *ent, key, key_len
+TSRMLS_CC);
} else {
key_len = sprintf(tmp_buf, "%ld", idx);
- php_wddx_serialize_var(packet, *ent, tmp_buf, key_len);
+ php_wddx_serialize_var(packet, *ent, tmp_buf, key_len
+TSRMLS_CC);
}
}
php_wddx_add_chunk_static(packet, WDDX_STRUCT_E);
@@ -596,13 +596,13 @@
ent_type = zend_hash_get_current_key_ex(target_hash, &key,
&key_len, &idx, 0, NULL);
if (ent_type == HASH_KEY_IS_STRING) {
- php_wddx_serialize_var(packet, *ent, key, key_len);
+ php_wddx_serialize_var(packet, *ent, key, key_len
+TSRMLS_CC);
} else {
key_len = sprintf(tmp_buf, "%ld", idx);
- php_wddx_serialize_var(packet, *ent, tmp_buf, key_len);
+ php_wddx_serialize_var(packet, *ent, tmp_buf, key_len
+TSRMLS_CC);
}
} else
- php_wddx_serialize_var(packet, *ent, NULL, 0);
+ php_wddx_serialize_var(packet, *ent, NULL, 0 TSRMLS_CC);
}
if (is_struct) {
@@ -615,14 +615,14 @@
/* {{{ php_wddx_serialize_var
*/
-void php_wddx_serialize_var(wddx_packet *packet, zval *var, char *name, int name_len)
+void php_wddx_serialize_var(wddx_packet *packet, zval *var, char *name, int name_len
+TSRMLS_DC)
{
char tmp_buf[WDDX_BUF_LEN];
char *name_esc;
int name_esc_len;
if (name) {
- name_esc = php_escape_html_entities(name, name_len, &name_esc_len, 0,
ENT_QUOTES, NULL);
+ name_esc = php_escape_html_entities(name, name_len, &name_esc_len, 0,
+ENT_QUOTES, NULL TSRMLS_CC);
sprintf(tmp_buf, WDDX_VAR_S, name_esc);
php_wddx_add_chunk(packet, tmp_buf);
efree(name_esc);
@@ -673,7 +673,7 @@
{
if (zend_hash_find(EG(active_symbol_table), Z_STRVAL_P(name_var),
Z_STRLEN_P(name_var)+1,
(void**)&val) != FAILURE) {
- php_wddx_serialize_var(packet, *val, Z_STRVAL_P(name_var),
Z_STRLEN_P(name_var));
+ php_wddx_serialize_var(packet, *val, Z_STRVAL_P(name_var),
+Z_STRLEN_P(name_var) TSRMLS_CC);
}
}
else if (Z_TYPE_P(name_var) == IS_ARRAY || Z_TYPE_P(name_var) == IS_OBJECT)
@@ -1114,7 +1114,7 @@
}
php_wddx_packet_start(packet, comment, comment_len);
- php_wddx_serialize_var(packet, var, NULL, 0);
+ php_wddx_serialize_var(packet, var, NULL, 0 TSRMLS_CC);
php_wddx_packet_end(packet);
ZVAL_STRINGL(return_value, packet->c, packet->len, 1);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
