Consting IO and Devel::Peek

Reply-To: Perl 5 Porters <perl5-porters@perl.org>
Message-ID: <20050531212621.GA12117@petdance.com>

p4raw-id: //depot/perl@24702

diff --git a/ext/Devel/Peek/Peek.xs b/ext/Devel/Peek/Peek.xs
index 13fce6a..4de466e 100644 (file)
--- a/ext/Devel/Peek/Peek.xs
+++ b/ext/Devel/Peek/Peek.xs
@@ -7,7 +7,7 @@ bool
 _runops_debug(int flag)
 {
     dTHX;
-    bool d = PL_runops == MEMBER_TO_FPTR(Perl_runops_debug);
+    const bool d = PL_runops == MEMBER_TO_FPTR(Perl_runops_debug);
 
     if (flag >= 0)
        PL_runops 
@@ -174,7 +174,7 @@ fill_mstats(SV *sv, int level)
 }
 
 void
-_mstats_to_hv(HV *hv, struct mstats_buffer *b, int level)
+_mstats_to_hv(HV *hv, const struct mstats_buffer *b, int level)
 {
     dTHX;
     SV **svp;
@@ -338,9 +338,9 @@ I32 lim
 PPCODE:
 {
     SV *pv_lim_sv = perl_get_sv("Devel::Peek::pv_limit", FALSE);
-    STRLEN pv_lim = pv_lim_sv ? SvIV(pv_lim_sv) : 0;
+    const STRLEN pv_lim = pv_lim_sv ? SvIV(pv_lim_sv) : 0;
     SV *dumpop = perl_get_sv("Devel::Peek::dump_ops", FALSE);
-    I32 save_dumpindent = PL_dumpindent;
+    const I32 save_dumpindent = PL_dumpindent;
     PL_dumpindent = 2;
     do_sv_dump(0, Perl_debug_log, sv, 0, lim,
               (bool)(dumpop && SvTRUE(dumpop)), pv_lim);
@@ -354,9 +354,9 @@ PPCODE:
 {
     long i;
     SV *pv_lim_sv = perl_get_sv("Devel::Peek::pv_limit", FALSE);
-    STRLEN pv_lim = pv_lim_sv ? SvIV(pv_lim_sv) : 0;
+    const STRLEN pv_lim = pv_lim_sv ? SvIV(pv_lim_sv) : 0;
     SV *dumpop = perl_get_sv("Devel::Peek::dump_ops", FALSE);
-    I32 save_dumpindent = PL_dumpindent;
+    const I32 save_dumpindent = PL_dumpindent;
     PL_dumpindent = 2;
 
     for (i=1; i<items; i++) {

diff --git a/ext/IO/IO.xs b/ext/IO/IO.xs
index 39e4486..79ffb90 100644 (file)
--- a/ext/IO/IO.xs
+++ b/ext/IO/IO.xs
@@ -49,11 +49,12 @@ typedef FILE * OutputStream;
 #define gv_stashpvn(str,len,flags) gv_stashpv(str,flags)
 #endif
 
+static int not_here(const char *s) __attribute__noreturn__;
 static int
-not_here(char *s)
+not_here(const char *s)
 {
     croak("%s not implemented on this architecture", s);
-    return -1;
+    NORETURN_FUNCTION_END
 }
 
 
@@ -105,8 +106,7 @@ io_blocking(pTHX_ InputStream f, int block)
        }
 #endif
        if (newmode != mode) {
-           int ret;
-           ret = fcntl(PerlIO_fileno(f),F_SETFL,newmode);
+           const int ret = fcntl(PerlIO_fileno(f),F_SETFL,newmode);
            if (ret < 0)
                RETVAL = ret;
        }
@@ -173,7 +173,7 @@ MODULE = IO PACKAGE = IO::File      PREFIX = f
 
 void
 new_tmpfile(packname = "IO::File")
-    char *             packname
+    const char *       packname
     PREINIT:
        OutputStream fp;
        GV *gv;
@@ -203,7 +203,7 @@ _poll(timeout,...)
 PPCODE:
 {
 #ifdef HAS_POLL
-    int nfd = (items - 1) / 2;
+    const int nfd = (items - 1) / 2;
     SV *tmpsv = NEWSV(999,nfd * sizeof(struct pollfd));
     struct pollfd *fds = (struct pollfd *)SvPVX(tmpsv);
     int i,j,ret;
@@ -236,7 +236,7 @@ io_blocking(handle,blk=-1)
 PROTOTYPE: $;$
 CODE:
 {
-    int ret = io_blocking(aTHX_ handle, items == 1 ? -1 : blk ? 1 : 0);
+    const int ret = io_blocking(aTHX_ handle, items == 1 ? -1 : blk ? 1 : 0);
     if(ret >= 0)
        XSRETURN_IV(ret);
     else