From 17b2f3c3d8e9edb6af175fc9f2306e9571693be6 Mon Sep 17 00:00:00 2001
From: Kalle Sommer Nielsen <kalle@php.net>
Date: Tue, 19 May 2009 16:32:22 +0000
Subject: [PATCH] Fix compiler warnings (only in HEAD)

---
 ext/wddx/wddx.c             | 16 ++++++++--------
 ext/xmlrpc/xmlrpc-epi-php.c |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/ext/wddx/wddx.c b/ext/wddx/wddx.c
index 277a5738a1..4c4d6ff4bf 100644
--- a/ext/wddx/wddx.c
+++ b/ext/wddx/wddx.c
@@ -294,7 +294,7 @@ PS_SERIALIZER_DECODE_FUNC(wddx)
 {
 	zval *retval;
 	zval **ent;
-	char *key;
+	zstr key;
 	uint key_length;
 	char tmp[128];
 	ulong idx;
@@ -316,11 +316,11 @@ PS_SERIALIZER_DECODE_FUNC(wddx)
 			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 @@ static void php_wddx_serialize_object(wddx_packet *packet, zval *obj)
 /* 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 @@ static void php_wddx_serialize_object(wddx_packet *packet, zval *obj)
 			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_object(wddx_packet *packet, zval *obj)
 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 @@ static void php_wddx_serialize_array(wddx_packet *packet, zval *arr)
 			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);
diff --git a/ext/xmlrpc/xmlrpc-epi-php.c b/ext/xmlrpc/xmlrpc-epi-php.c
index 0410240b58..33fb27e597 100644
--- a/ext/xmlrpc/xmlrpc-epi-php.c
+++ b/ext/xmlrpc/xmlrpc-epi-php.c
@@ -490,7 +490,7 @@ static XMLRPC_VECTOR_TYPE determine_vector_type (HashTable *ht) /* {{{ */
 {
 	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 @@ static XMLRPC_VALUE PHP_to_XMLRPC_worker (const char* key, zval* in_val, int dep
 					{
 						unsigned long num_index;
 						zval** pIter;
-						char* my_key;
+						zstr my_key;
 						HashTable *ht = NULL;
 
 						ht = HASH_OF(val);
@@ -585,7 +585,7 @@ static XMLRPC_VALUE PHP_to_XMLRPC_worker (const char* key, zval* in_val, int dep
 									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--;
-- 
2.40.0