Skip to content

Commit 5058774

Browse files
committed
propagated const, to avoid "discards qualifiers from pointer target type" errors
1 parent d7ddc19 commit 5058774

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

ext/ereg/regex/regcomp.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -724,9 +724,9 @@ register struct parse *p;
724724
register cset *cs;
725725
{
726726
register unsigned char *sp = p->next;
727-
register struct cclass *cp;
727+
register const struct cclass *cp;
728728
register size_t len;
729-
register unsigned char *u;
729+
register const unsigned char *u;
730730
register unsigned char c;
731731

732732
while (MORE() && isalpha(PEEK()))
@@ -795,7 +795,7 @@ register struct parse *p;
795795
int endc; /* name ended by endc,']' */
796796
{
797797
register unsigned char *sp = p->next;
798-
register struct cname *cp;
798+
register const struct cname *cp;
799799
register int len;
800800

801801
while (MORE() && !SEETWO(endc, ']'))
@@ -1153,7 +1153,7 @@ static void
11531153
mcadd(p, cs, cp)
11541154
register struct parse *p;
11551155
register cset *cs;
1156-
register unsigned char *cp;
1156+
register const unsigned char *cp;
11571157
{
11581158
register size_t oldend = cs->smultis;
11591159

ext/ereg/regex/regcomp.ih

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ static void freeset(register struct parse *p, register cset *cs);
2727
static int freezeset(register struct parse *p, register cset *cs);
2828
static int firstch(register struct parse *p, register cset *cs);
2929
static int nch(register struct parse *p, register cset *cs);
30-
static void mcadd(register struct parse *p, register cset *cs, register unsigned char *cp);
30+
static void mcadd(register struct parse *p, register cset *cs, register const unsigned char *cp);
3131
#if 0
3232
static void mcsub(register cset *cs, register unsigned char *cp);
3333
static int mcin(register cset *cs, register unsigned char *cp);

ext/simplexml/simplexml.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ static void php_sxe_iterator_rewind(zend_object_iterator *iter TSRMLS_DC);
6767

6868
/* {{{ _node_as_zval()
6969
*/
70-
static void _node_as_zval(php_sxe_object *sxe, xmlNodePtr node, zval *value, SXE_ITER itertype, char *name, xmlChar *nsprefix, int isprefix TSRMLS_DC)
70+
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)
7171
{
7272
php_sxe_object *subnode;
7373

@@ -79,7 +79,7 @@ static void _node_as_zval(php_sxe_object *sxe, xmlNodePtr node, zval *value, SXE
7979
subnode->iter.name = xmlStrdup((xmlChar *)name);
8080
}
8181
if (nsprefix && *nsprefix) {
82-
subnode->iter.nsprefix = xmlStrdup((xmlChar *)nsprefix);
82+
subnode->iter.nsprefix = xmlStrdup(nsprefix);
8383
subnode->iter.isprefix = isprefix;
8484
}
8585

0 commit comments

Comments
 (0)