cvs: php-src /ext/readline readline.c /ext/soap php_encoding.c

iliaa Tue Apr 12 12:41:42 2005 EDT Modified files: /php-src/ext/soap php_encoding.c /php-src/ext/readline readline.c Log: Fixed compiler warning. http://cvs.php.net/diff.php/php-src/ext/soap/php_encoding.c?r1=1.92&r2=1.93&ty=u Index: php-src/ext/soap/php_encoding.c diff -u php-src/ext/soap/php_encoding.c:1.92 php-src/ext/soap/php_encoding.c:1.93 --- php-src/ext/soap/php_encoding.c:1.92 Mon Apr 11 21:00:48 2005 +++ php-src/ext/soap/php_encoding.c Tue Apr 12 12:41:41 2005 @@ -17,7 +17,7 @@ | Dmitry Stogov <dmitry@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_encoding.c,v 1.92 2005/04/12 01:00:48 iliaa Exp $ */ +/* $Id: php_encoding.c,v 1.93 2005/04/12 16:41:41 iliaa Exp $ */ #include <time.h> @@ -1482,8 +1482,8 @@ /* 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); http://cvs.php.net/diff.php/php-src/ext/readline/readline.c?r1=1.40&r2=1.41&ty=u Index: php-src/ext/readline/readline.c diff -u php-src/ext/readline/readline.c:1.40 php-src/ext/readline/readline.c:1.41 --- php-src/ext/readline/readline.c:1.40 Thu Feb 3 19:21:50 2005 +++ php-src/ext/readline/readline.c Tue Apr 12 12:41:42 2005 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: readline.c,v 1.40 2005/02/04 00:21:50 iliaa Exp $ */ +/* $Id: readline.c,v 1.41 2005/04/12 16:41:42 iliaa Exp $ */ /* {{{ includes & prototypes */ @@ -177,13 +177,13 @@ 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 @@ } 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 @@ 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) {