kalle Tue May 19 16:32:23 2009 UTC
Modified files:
/php-src/ext/wddx wddx.c
/php-src/ext/xmlrpc xmlrpc-epi-php.c
Log:
Fix compiler warnings (only in HEAD)
http://cvs.php.net/viewvc.cgi/php-src/ext/wddx/wddx.c?r1=1.162&r2=1.163&diff_format=u
Index: php-src/ext/wddx/wddx.c
diff -u php-src/ext/wddx/wddx.c:1.162 php-src/ext/wddx/wddx.c:1.163
--- php-src/ext/wddx/wddx.c:1.162 Tue Mar 10 23:39:51 2009
+++ php-src/ext/wddx/wddx.c Tue May 19 16:32:22 2009
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: wddx.c,v 1.162 2009/03/10 23:39:51 helly Exp $ */
+/* $Id: wddx.c,v 1.163 2009/05/19 16:32:22 kalle Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -294,7 +294,7 @@
{
zval *retval;
zval **ent;
- char *key;
+ zstr key;
uint key_length;
char tmp[128];
ulong idx;
@@ -316,11 +316,11 @@
switch (hash_type) {
case HASH_KEY_IS_LONG:
key_length = snprintf(tmp, sizeof(tmp),
"%ld", idx) + 1;
- key = tmp;
+ key.s = tmp;
/* fallthru */
case HASH_KEY_IS_STRING:
- php_set_session_var(key, key_length-1,
*ent, NULL TSRMLS_CC);
- PS_ADD_VAR(key);
+ php_set_session_var(key.s,
key_length-1, *ent, NULL TSRMLS_CC);
+ PS_ADD_VAR(key.s);
}
}
}
@@ -455,7 +455,7 @@
/* OBJECTS_FIXME */
zval **ent, *fname, **varname;
zval *retval = NULL;
- char *key;
+ zstr key;
ulong idx;
char tmp_buf[WDDX_BUF_LEN];
HashTable *objhash, *sleephash;
@@ -529,7 +529,7 @@
if (zend_hash_get_current_key_ex(objhash, &key,
&key_len, &idx, 0, NULL) == HASH_KEY_IS_STRING) {
char *class_name, *prop_name;
- zend_unmangle_property_name(key, key_len-1,
&class_name, &prop_name);
+ zend_unmangle_property_name(key.s, key_len-1,
&class_name, &prop_name);
php_wddx_serialize_var(packet, *ent, prop_name,
strlen(prop_name)+1 TSRMLS_CC);
} else {
key_len = snprintf(tmp_buf, sizeof(tmp_buf),
"%ld", idx);
@@ -553,7 +553,7 @@
static void php_wddx_serialize_array(wddx_packet *packet, zval *arr)
{
zval **ent;
- char *key;
+ zstr key;
uint key_len;
int is_struct = 0, ent_type;
ulong idx;
@@ -601,7 +601,7 @@
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 TSRMLS_CC);
+ php_wddx_serialize_var(packet, *ent, key.s,
key_len TSRMLS_CC);
} else {
key_len = snprintf(tmp_buf, sizeof(tmp_buf),
"%ld", idx);
php_wddx_serialize_var(packet, *ent, tmp_buf,
key_len TSRMLS_CC);
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/xmlrpc-epi-php.c?r1=1.71&r2=1.72&diff_format=u
Index: php-src/ext/xmlrpc/xmlrpc-epi-php.c
diff -u php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.71
php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.72
--- php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.71 Thu May 14 12:30:06 2009
+++ php-src/ext/xmlrpc/xmlrpc-epi-php.c Tue May 19 16:32:22 2009
@@ -51,7 +51,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: xmlrpc-epi-php.c,v 1.71 2009/05/14 12:30:06 iliaa Exp $ */
+/* $Id: xmlrpc-epi-php.c,v 1.72 2009/05/19 16:32:22 kalle Exp $ */
/**********************************************************************
* BUGS: *
@@ -490,7 +490,7 @@
{
int bArray = 0, bStruct = 0, bMixed = 0;
unsigned long num_index;
- char* my_key;
+ zstr my_key;
zend_hash_internal_pointer_reset(ht);
while (1) {
@@ -558,7 +558,7 @@
{
unsigned long num_index;
zval** pIter;
- char* my_key;
+ zstr my_key;
HashTable *ht = NULL;
ht = HASH_OF(val);
@@ -585,7 +585,7 @@
if (res
== HASH_KEY_IS_LONG) {
XMLRPC_AddValueToVector(xReturn, PHP_to_XMLRPC_worker(0, *pIter, depth++
TSRMLS_CC));
} else {
-
XMLRPC_AddValueToVector(xReturn, PHP_to_XMLRPC_worker(my_key, *pIter, depth++
TSRMLS_CC));
+
XMLRPC_AddValueToVector(xReturn, PHP_to_XMLRPC_worker(my_key.s, *pIter, depth++
TSRMLS_CC));
}
if (ht)
{
ht->nApplyCount--;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
