mad-const patch

Message-ID: <466DA732.3010608@gmail.com>

p4raw-id: //depot/perl@31369

diff --git a/dump.c b/dump.c
index 7c28341..a83e17f 100644 (file)
--- a/dump.c
+++ b/dump.c
@@ -2141,11 +2141,11 @@ Perl_sv_catxmlsv(pTHX_ SV *dsv, SV *ssv)
 }
 
 char *
-Perl_sv_catxmlpvn(pTHX_ SV *dsv, char* pv, STRLEN len, int utf8)
+Perl_sv_catxmlpvn(pTHX_ SV *dsv, const char *pv, STRLEN len, int utf8)
 {
     unsigned int c;
     const char * const e = pv + len;
-    char *start = pv;
+    const char * const start = pv;
     STRLEN dsvcur;
     STRLEN cl;
 
@@ -2818,7 +2818,7 @@ Perl_do_op_xmldump(pTHX_ I32 level, PerlIO *file, const OP *o)
     if (PL_madskills && o->op_madprop) {
        char prevkey = '\0';
        SV * const tmpsv = newSVpvn("", 0);
-       const MADPROP* const mp = o->op_madprop;
+       const MADPROP* mp = o->op_madprop;
 
        sv_utf8_upgrade(tmpsv);
        if (!contents) {

diff --git a/embed.fnc b/embed.fnc
index 248c472..d282647 100644 (file)
--- a/embed.fnc
+++ b/embed.fnc
@@ -1834,7 +1834,7 @@ Mp        |void   |xmldump_sub    |NN const GV* gv
 Mp     |void   |xmldump_form   |NN const GV* gv
 Mp     |void   |xmldump_eval
 Mp     |char*  |sv_catxmlsv    |NN SV *dsv|NN SV *ssv
-Mp     |char*  |sv_catxmlpvn   |NN SV *dsv|NN char *pv|STRLEN len|int utf8
+Mp     |char*  |sv_catxmlpvn   |NN SV *dsv|NN const char *pv|STRLEN len|int utf8
 Mp     |char*  |sv_xmlpeek     |NN SV* sv
 Mp     |void   |do_pmop_xmldump|I32 level|NN PerlIO *file \
                                |NULLOK const PMOP *pm

diff --git a/proto.h b/proto.h
index 8919112..613fa85 100644 (file)
--- a/proto.h
+++ b/proto.h
@@ -4619,7 +4619,7 @@ PERL_CALLCONV char*       Perl_sv_catxmlsv(pTHX_ SV *dsv, SV *ssv)
                        __attribute__nonnull__(pTHX_1)
                        __attribute__nonnull__(pTHX_2);
 
-PERL_CALLCONV char*    Perl_sv_catxmlpvn(pTHX_ SV *dsv, char *pv, STRLEN len, int utf8)
+PERL_CALLCONV char*    Perl_sv_catxmlpvn(pTHX_ SV *dsv, const char *pv, STRLEN len, int utf8)
                        __attribute__nonnull__(pTHX_1)
                        __attribute__nonnull__(pTHX_2);