From: Ilia Alshanetsky <iliaa@php.net>
Date: Tue, 12 Apr 2005 16:41:42 +0000 (+0000)
Subject: Fixed compiler warning.
X-Git-Tag: php-5.0.1b1~539
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d5847b9cf720dae0b7b9e3237e19e1b7cf7f1902;p=php

Fixed compiler warning.
---

diff --git a/ext/readline/readline.c b/ext/readline/readline.c
index 28d7ed709c..3e3e6c9393 100644
--- a/ext/readline/readline.c
+++ b/ext/readline/readline.c
@@ -177,13 +177,13 @@ PHP_FUNCTION(readline_info)
 		add_assoc_long(return_value,"done",rl_done);
 		add_assoc_long(return_value,"pending_input",rl_pending_input);
 		add_assoc_string(return_value,"prompt",SAFE_STRING(rl_prompt),1);
-		add_assoc_string(return_value,"terminal_name",SAFE_STRING(rl_terminal_name),1);
+		add_assoc_string(return_value,"terminal_name",(char *)SAFE_STRING(rl_terminal_name),1);
 #endif
 #if HAVE_ERASE_EMPTY_LINE
 		add_assoc_long(return_value,"erase_empty_line",rl_erase_empty_line);
 #endif
-		add_assoc_string(return_value,"library_version",SAFE_STRING(rl_library_version),1);
-		add_assoc_string(return_value,"readline_name",SAFE_STRING(rl_readline_name),1);
+		add_assoc_string(return_value,"library_version",(char *)SAFE_STRING(rl_library_version),1);
+		add_assoc_string(return_value,"readline_name",(char *)SAFE_STRING(rl_readline_name),1);
 	} else {
 		convert_to_string_ex(what);
 
@@ -219,7 +219,7 @@ PHP_FUNCTION(readline_info)
 		} else if (! strcasecmp(Z_STRVAL_PP(what),"prompt")) {
 			RETVAL_STRING(SAFE_STRING(rl_prompt),1);
 		} else if (! strcasecmp(Z_STRVAL_PP(what),"terminal_name")) {
-			RETVAL_STRING(SAFE_STRING(rl_terminal_name),1);
+			RETVAL_STRING((char *)SAFE_STRING(rl_terminal_name),1);
 #endif
 #if HAVE_ERASE_EMPTY_LINE
 		} else if (! strcasecmp(Z_STRVAL_PP(what),"erase_empty_line")) {
@@ -231,7 +231,7 @@ PHP_FUNCTION(readline_info)
 			RETVAL_LONG(oldval);
 #endif
 		} else if (! strcasecmp(Z_STRVAL_PP(what),"library_version")) {
-			RETVAL_STRING(SAFE_STRING(rl_library_version),1);
+			RETVAL_STRING((char *)SAFE_STRING(rl_library_version),1);
 		} else if (! strcasecmp(Z_STRVAL_PP(what),"readline_name")) {
 			oldstr = (char*)rl_readline_name;
 			if (ac == 2) {
diff --git a/ext/soap/php_encoding.c b/ext/soap/php_encoding.c
index a8b64fcee5..c2fdef0680 100644
--- a/ext/soap/php_encoding.c
+++ b/ext/soap/php_encoding.c
@@ -1482,8 +1482,8 @@ static xmlNodePtr to_xml_object(encodeTypePtr type, zval *data, int style, xmlNo
 								/* we need to handle xml: namespace specially, since it is
 								   an implicit schema. Otherwise, use form.
 								*/
-								if (!strncmp((*attr)->namens, XML_NAMESPACE, sizeof(XML_NAMESPACE)) || 
-								    ((*attr)->form == XSD_FORM_QUALIFIED) && (*attr)->namens) {
+								if ((!strncmp((*attr)->namens, XML_NAMESPACE, sizeof(XML_NAMESPACE)) || 
+								    ((*attr)->form == XSD_FORM_QUALIFIED)) && (*attr)->namens) {
 									xmlNsPtr nsp = encode_add_ns(xmlParam, (*attr)->namens);
 
 									xmlSetNsProp(xmlParam, nsp, (*attr)->name, dummy->children->content);