indeyets Thu Oct 16 11:38:25 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/ereg/regex regcomp.c regcomp.ih /php-src/ext/simplexml simplexml.c Log: propagated const, to avoid "discards qualifiers from pointer target type" errors http://cvs.php.net/viewvc.cgi/php-src/ext/ereg/regex/regcomp.c?r1=1.7.2.2&r2=1.7.2.3&diff_format=u Index: php-src/ext/ereg/regex/regcomp.c diff -u php-src/ext/ereg/regex/regcomp.c:1.7.2.2 php-src/ext/ereg/regex/regcomp.c:1.7.2.3 --- php-src/ext/ereg/regex/regcomp.c:1.7.2.2 Fri Oct 5 15:00:06 2007 +++ php-src/ext/ereg/regex/regcomp.c Thu Oct 16 11:38:25 2008 @@ -724,9 +724,9 @@ register cset *cs; { register unsigned char *sp = p->next; - register struct cclass *cp; + register const struct cclass *cp; register size_t len; - register unsigned char *u; + register const unsigned char *u; register unsigned char c; while (MORE() && isalpha(PEEK())) @@ -795,7 +795,7 @@ int endc; /* name ended by endc,']' */ { register unsigned char *sp = p->next; - register struct cname *cp; + register const struct cname *cp; register int len; while (MORE() && !SEETWO(endc, ']')) @@ -1153,7 +1153,7 @@ mcadd(p, cs, cp) register struct parse *p; register cset *cs; -register unsigned char *cp; +register const unsigned char *cp; { register size_t oldend = cs->smultis; http://cvs.php.net/viewvc.cgi/php-src/ext/ereg/regex/regcomp.ih?r1=1.5.8.2&r2=1.5.8.3&diff_format=u Index: php-src/ext/ereg/regex/regcomp.ih diff -u php-src/ext/ereg/regex/regcomp.ih:1.5.8.2 php-src/ext/ereg/regex/regcomp.ih:1.5.8.3 --- php-src/ext/ereg/regex/regcomp.ih:1.5.8.2 Fri Oct 5 15:00:06 2007 +++ php-src/ext/ereg/regex/regcomp.ih Thu Oct 16 11:38:25 2008 @@ -27,7 +27,7 @@ static int freezeset(register struct parse *p, register cset *cs); static int firstch(register struct parse *p, register cset *cs); static int nch(register struct parse *p, register cset *cs); -static void mcadd(register struct parse *p, register cset *cs, register unsigned char *cp); +static void mcadd(register struct parse *p, register cset *cs, register const unsigned char *cp); #if 0 static void mcsub(register cset *cs, register unsigned char *cp); static int mcin(register cset *cs, register unsigned char *cp); http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.151.2.22.2.35.2.20&r2=1.151.2.22.2.35.2.21&diff_format=u Index: php-src/ext/simplexml/simplexml.c diff -u php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35.2.20 php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35.2.21 --- php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35.2.20 Thu Sep 11 14:21:33 2008 +++ php-src/ext/simplexml/simplexml.c Thu Oct 16 11:38:25 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: simplexml.c,v 1.151.2.22.2.35.2.20 2008/09/11 14:21:33 rrichards Exp $ */ +/* $Id: simplexml.c,v 1.151.2.22.2.35.2.21 2008/10/16 11:38:25 indeyets Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -67,7 +67,7 @@ /* {{{ _node_as_zval() */ -static void _node_as_zval(php_sxe_object *sxe, xmlNodePtr node, zval *value, SXE_ITER itertype, char *name, xmlChar *nsprefix, int isprefix TSRMLS_DC) +static void _node_as_zval(php_sxe_object *sxe, xmlNodePtr node, zval *value, SXE_ITER itertype, char *name, const xmlChar *nsprefix, int isprefix TSRMLS_DC) { php_sxe_object *subnode; @@ -79,7 +79,7 @@ subnode->iter.name = xmlStrdup((xmlChar *)name); } if (nsprefix && *nsprefix) { - subnode->iter.nsprefix = xmlStrdup((xmlChar *)nsprefix); + subnode->iter.nsprefix = xmlStrdup(nsprefix); subnode->iter.isprefix = isprefix; } @@ -2562,7 +2562,7 @@ { php_info_print_table_start(); php_info_print_table_header(2, "Simplexml support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.151.2.22.2.35.2.20 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.151.2.22.2.35.2.21 $"); php_info_print_table_row(2, "Schema support", #ifdef LIBXML_SCHEMAS_ENABLED "enabled");
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php