Force RVALUE macros when in PERL_DEBUG_COW

[perl5.git] / deb.c

diff --git a/deb.c b/deb.c
index 21688c3..b34520e 100644 (file)
--- a/deb.c
+++ b/deb.c
@@ -1,7 +1,7 @@
 /*    deb.c
  *
  *    Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999,
- *    2000, 2001, 2002, by Larry Wall and others
+ *    2000, 2001, 2002, 2003, 2004, 2005, by Larry Wall and others
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
@@ -14,8 +14,8 @@
  */
 
 /*
- * This file contains various utilites for producing debugging output
- * (mainly related to  displaying the stack)
+ * This file contains various utilities for producing debugging output
+ * (mainly related to displaying the stack)
  */
 
 #include "EXTERN.h"
@@ -149,7 +149,7 @@ Perl_debstack(pTHX)
 
 
 #ifdef DEBUGGING
-static char * si_names[] = {
+static const char * si_names[] = {
     "UNKNOWN",
     "UNDEF",
     "MAIN",
@@ -173,7 +173,6 @@ Perl_deb_stack_all(pTHX)
 #ifdef DEBUGGING
     I32                 ix, si_ix;
     PERL_SI     *si;
-    PERL_CONTEXT *cx;
 
     /* rewind to start of chain */
     si = PL_curstackinfo;
@@ -183,18 +182,14 @@ Perl_deb_stack_all(pTHX)
     si_ix=0;
     for (;;)
     {
-       char *si_name;
-       int si_name_ix = si->si_type+1; /* -1 is a valid index */
-       if (si_name_ix>= sizeof(si_names))
-           si_name = "????";
-       else
-           si_name = si_names[si_name_ix];
+        const int si_name_ix = si->si_type+1; /* -1 is a valid index */
+        const char *si_name = (si_name_ix>= sizeof(si_names)) ? "????" : si_names[si_name_ix];
        PerlIO_printf(Perl_debug_log, "STACK %"IVdf": %s\n",
                                                (IV)si_ix, si_name);
 
        for (ix=0; ix<=si->si_cxix; ix++) {
 
-           cx = &(si->si_cxstack[ix]);
+           const PERL_CONTEXT *cx = &(si->si_cxstack[ix]);
            PerlIO_printf(Perl_debug_log,
                    "  CX %"IVdf": %-6s => ",
                    (IV)ix, PL_block_type[CxTYPE(cx)]