X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=deb.c;h=933ae6cdab350f1c9deae5ee9d52d5ac2e4d72d0;hb=06705523e0517b0027174c49916c620f6946316f;hp=21688c3fd68cea3c4da9c5441304cc2f9a54dd5d;hpb=166f8a29442475f7fe0e9216f957512a793bc4ed;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/deb.c b/deb.c
index 21688c3..933ae6c 100644
--- 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"
@@ -44,6 +44,8 @@ Perl_deb(pTHX_ const char *pat, ...)
     va_start(args, pat);
     vdeb(pat, &args);
     va_end(args);
+#else
+    PERL_UNUSED_ARG(pat);
 #endif /* DEBUGGING */
 }
 
@@ -56,6 +58,9 @@ Perl_vdeb(pTHX_ const char *pat, va_list *args)
     PerlIO_printf(Perl_debug_log, "(%s:%ld)\t", (file ? file : "<free>"),
 		  (long)CopLINE(PL_curcop));
     (void) PerlIO_vprintf(Perl_debug_log, pat, *args);
+#else
+    PERL_UNUSED_ARG(pat);
+    PERL_UNUSED_ARG(args);
 #endif /* DEBUGGING */
 }
 
@@ -93,7 +98,7 @@ S_deb_stack_n(pTHX_ SV** stack_base, I32 stack_min, I32 stack_max,
 {
 #ifdef DEBUGGING
     register I32 i = stack_max - 30;
-    I32 *markscan = PL_markstack + mark_min;
+    const I32 *markscan = PL_markstack + mark_min;
     if (i < stack_min)
 	i = stack_min;
     
@@ -122,6 +127,12 @@ S_deb_stack_n(pTHX_ SV** stack_base, I32 stack_min, I32 stack_max,
     }
     while (1);
     PerlIO_printf(Perl_debug_log, "\n");
+#else
+    PERL_UNUSED_ARG(stack_base);
+    PERL_UNUSED_ARG(stack_min);
+    PERL_UNUSED_ARG(stack_max);
+    PERL_UNUSED_ARG(mark_min);
+    PERL_UNUSED_ARG(mark_max);
 #endif /* DEBUGGING */
 }
 
@@ -149,7 +160,7 @@ Perl_debstack(pTHX)
 
 
 #ifdef DEBUGGING
-static char * si_names[] = {
+static const char * const si_names[] = {
     "UNKNOWN",
     "UNDEF",
     "MAIN",
@@ -171,9 +182,8 @@ void
 Perl_deb_stack_all(pTHX)
 {
 #ifdef DEBUGGING
-    I32		 ix, si_ix;
-    PERL_SI	 *si;
-    PERL_CONTEXT *cx;
+    I32 si_ix;
+    const PERL_SI *si;
 
     /* rewind to start of chain */
     si = PL_curstackinfo;
@@ -183,18 +193,15 @@ 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 * const si_name = (si_name_ix>= sizeof(si_names)) ? "????" : si_names[si_name_ix];
+	I32 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 * const cx = &(si->si_cxstack[ix]);
 	    PerlIO_printf(Perl_debug_log,
 		    "  CX %"IVdf": %-6s => ",
 		    (IV)ix, PL_block_type[CxTYPE(cx)]
@@ -211,9 +218,8 @@ Perl_deb_stack_all(pTHX)
 		 */
 
 		I32 i, stack_min, stack_max, mark_min, mark_max;
-		PERL_CONTEXT *cx_n;
-		PERL_SI      *si_n;
-		OP	     *retop;
+		const PERL_CONTEXT *cx_n;
+		const PERL_SI *si_n;
 
 		cx_n = Null(PERL_CONTEXT*);
 
@@ -275,7 +281,7 @@ Perl_deb_stack_all(pTHX)
 		if (CxTYPE(cx) == CXt_EVAL || CxTYPE(cx) == CXt_SUB
 			|| CxTYPE(cx) == CXt_FORMAT)
 		{
-		    retop = (CxTYPE(cx) == CXt_EVAL)
+		    const OP * const retop = (CxTYPE(cx) == CXt_EVAL)
 			    ? cx->blk_eval.retop : cx->blk_sub.retop;
 
 		    PerlIO_printf(Perl_debug_log, "  retop=%s\n",
@@ -298,4 +304,12 @@ Perl_deb_stack_all(pTHX)
 #endif /* DEBUGGING */
 }
 
-
+/*
+ * Local variables:
+ * c-indentation-style: bsd
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ *
+ * ex: set ts=8 sts=4 sw=4 noet:
+ */