[PHP-CVS] cvs: php-src(PHP_5_2) /ext/soap php_encoding.c soap.c

[Dmitry Stogov]

dmitry          Tue Jul 11 14:35:50 2006 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/ext/soap   php_encoding.c soap.c 
  Log:
  Nuke signed/unsigned compiler warnings
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_encoding.c?r1=1.103.2.21.2.6&r2=1.103.2.21.2.7&diff_format=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.103.2.21.2.6 
php-src/ext/soap/php_encoding.c:1.103.2.21.2.7
--- php-src/ext/soap/php_encoding.c:1.103.2.21.2.6      Tue Jul 11 14:24:18 2006
+++ php-src/ext/soap/php_encoding.c     Tue Jul 11 14:35:50 2006
@@ -17,7 +17,7 @@
   |          Dmitry Stogov <[EMAIL PROTECTED]>                             |
   +----------------------------------------------------------------------+
 */
-/* $Id: php_encoding.c,v 1.103.2.21.2.6 2006/07/11 14:24:18 dmitry Exp $ */
+/* $Id: php_encoding.c,v 1.103.2.21.2.7 2006/07/11 14:35:50 dmitry Exp $ */
 
 #include <time.h>
 
@@ -1755,7 +1755,8 @@
                                zval **zprop;
                                char *str_key;
                                ulong index;
-                               int key_type, str_key_len;
+                               int key_type;
+                               unsigned int str_key_len;
 
                                key_type = zend_hash_get_current_key_ex(prop, 
&str_key, &str_key_len, &index, FALSE, NULL);
                                zend_hash_get_current_data(prop, (void 
**)&zprop);
@@ -2402,7 +2403,7 @@
                        xmlNodePtr key;
                        zval **temp_data;
                        char *key_val;
-                       int int_val;
+                       ulong int_val;
 
                        zend_hash_get_current_data(data->value.ht, (void 
**)&temp_data);
                        if (Z_TYPE_PP(temp_data) != IS_NULL) {
@@ -2410,7 +2411,7 @@
                                xmlAddChild(xmlParam, item);
                                key = xmlNewNode(NULL, BAD_CAST("key"));
                                xmlAddChild(item,key);
-                               if (zend_hash_get_current_key(data->value.ht, 
&key_val, (long *)&int_val, FALSE) == HASH_KEY_IS_STRING) {
+                               if (zend_hash_get_current_key(data->value.ht, 
&key_val, &int_val, FALSE) == HASH_KEY_IS_STRING) {
                                        if (style == SOAP_ENCODED) {
                                                set_xsi_type(key, "xsd:string");
                                        }
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.156.2.28.2.5&r2=1.156.2.28.2.6&diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.156.2.28.2.5 
php-src/ext/soap/soap.c:1.156.2.28.2.6
--- php-src/ext/soap/soap.c:1.156.2.28.2.5      Tue Jul 11 14:24:18 2006
+++ php-src/ext/soap/soap.c     Tue Jul 11 14:35:50 2006
@@ -17,7 +17,7 @@
   |          Dmitry Stogov <[EMAIL PROTECTED]>                             |
   +----------------------------------------------------------------------+
 */
-/* $Id: soap.c,v 1.156.2.28.2.5 2006/07/11 14:24:18 dmitry Exp $ */
+/* $Id: soap.c,v 1.156.2.28.2.6 2006/07/11 14:35:50 dmitry Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -3539,8 +3539,8 @@
                zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(ret), &pos);
                while (zend_hash_get_current_data_ex(Z_ARRVAL_P(ret), (void 
**)&data, &pos) != FAILURE) {
                        char *param_name = NULL;
-                       int   param_name_len;
-                       long  param_index = i;
+                       unsigned int param_name_len;
+                       ulong param_index = i;
 
                        zend_hash_get_current_key_ex(Z_ARRVAL_P(ret), 
&param_name, &param_name_len, &param_index, 0, &pos);
                        parameter = get_param(function, param_name, 
param_index, TRUE);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php