Browse Source

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

PECL
Alexey Zakhlestin 17 years ago
parent
commit
5058774e1f
  1. 8
      ext/ereg/regex/regcomp.c
  2. 2
      ext/ereg/regex/regcomp.ih
  3. 4
      ext/simplexml/simplexml.c

8
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;

2
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);

4
ext/simplexml/simplexml.c

@ -67,7 +67,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;
@ -79,7 +79,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;
}

Loading…
Cancel
Save