diff options
| author | Alexey Zakhlestin <indeyets@php.net> | 2008-10-16 11:42:20 +0000 |
|---|---|---|
| committer | Alexey Zakhlestin <indeyets@php.net> | 2008-10-16 11:42:20 +0000 |
| commit | 818f03d9cd7aa7960fb0306989f681f8081ed19d (patch) | |
| tree | 98cd156907c30f5ec05791167c8d79558fbc2ca9 | |
| parent | 4427e3adb8e8920f66cd047d37ac78cd79ad9bce (diff) | |
| download | php-git-818f03d9cd7aa7960fb0306989f681f8081ed19d.tar.gz | |
MFB: propagated const, to avoid "discards qualifiers from pointer target type" errors
| -rw-r--r-- | ext/ereg/regex/regcomp.c | 8 | ||||
| -rw-r--r-- | ext/ereg/regex/regcomp.ih | 2 | ||||
| -rw-r--r-- | ext/simplexml/simplexml.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/ext/ereg/regex/regcomp.c b/ext/ereg/regex/regcomp.c index d72cc82940..156eee9329 100644 --- a/ext/ereg/regex/regcomp.c +++ b/ext/ereg/regex/regcomp.c @@ -724,9 +724,9 @@ register struct parse *p; 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 @@ register struct parse *p; 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 @@ static void 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; diff --git a/ext/ereg/regex/regcomp.ih b/ext/ereg/regex/regcomp.ih index c93d32e51d..606948131b 100644 --- a/ext/ereg/regex/regcomp.ih +++ b/ext/ereg/regex/regcomp.ih @@ -27,7 +27,7 @@ static void freeset(register struct parse *p, register cset *cs); 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); diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c index db1e840dc4..60ba959c84 100644 --- a/ext/simplexml/simplexml.c +++ b/ext/simplexml/simplexml.c @@ -69,7 +69,7 @@ static void php_sxe_iterator_rewind(zend_object_iterator *iter TSRMLS_DC); /* {{{ _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; @@ -81,7 +81,7 @@ static void _node_as_zval(php_sxe_object *sxe, xmlNodePtr node, zval *value, SXE subnode->iter.name = xmlStrdup((xmlChar *)name); } if (nsprefix && *nsprefix) { - subnode->iter.nsprefix = xmlStrdup((xmlChar *)nsprefix); + subnode->iter.nsprefix = xmlStrdup(nsprefix); subnode->iter.isprefix = isprefix; } |