MFB: propagated const, to avoid "discards qualifiers from pointer target type" errors

diff --git a/ext/ereg/regex/regcomp.c b/ext/ereg/regex/regcomp.c
index d72cc829403be37d9849f6f73e6eeef55c0cd082..156eee93292a2c0cd7c4514250a5c07cc8f99fcc 100644 (file)
--- 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 c93d32e51d32e489607693797f1ac7bf50438db2..606948131b36b0b4c4f018748be1c5025c525690 100644 (file)
--- 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 db1e840dc4ef7b081047bf4620ecb04a0377627d..60ba959c840a36710f23ff186da7457b9d2fd99e 100644 (file)
--- 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;
        }