X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=deb.c;h=37d7a7c1023424f16efc9651060fcc6c98ef44da;hb=e59c8b07349f66b8f6de8cad95787c1bfaf1297d;hp=a21066e697ab8fd3c9af64376df8e1c839340482;hpb=54ca4ee7252684545d9524460bab88037e5f584b;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/deb.c b/deb.c
index a21066e..37d7a7c 100644
--- a/deb.c
+++ b/deb.c
@@ -32,6 +32,8 @@ Perl_deb_nocontext(const char *pat, ...)
     va_start(args, pat);
     vdeb(pat, &args);
     va_end(args);
+#else
+    PERL_UNUSED_ARG(pat);
 #endif /* DEBUGGING */
 }
 #endif
@@ -45,6 +47,7 @@ Perl_deb(pTHX_ const char *pat, ...)
     vdeb(pat, &args);
     va_end(args);
 #else
+    PERL_UNUSED_CONTEXT;
     PERL_UNUSED_ARG(pat);
 #endif /* DEBUGGING */
 }
@@ -54,12 +57,18 @@ Perl_vdeb(pTHX_ const char *pat, va_list *args)
 {
 #ifdef DEBUGGING
     dVAR;
-    char* file = OutCopFILE(PL_curcop);
-
-    PerlIO_printf(Perl_debug_log, "(%s:%ld)\t", (file ? file : "<free>"),
-		  (long)CopLINE(PL_curcop));
+    const char* const file = PL_curcop ? OutCopFILE(PL_curcop) : "<null>";
+    const char* const display_file = file ? file : "<free>";
+    const long line = PL_curcop ? (long)CopLINE(PL_curcop) : 0;
+
+    if (DEBUG_v_TEST)
+	PerlIO_printf(Perl_debug_log, "(%ld:%s:%ld)\t",
+		      (long)PerlProc_getpid(), display_file, line);
+    else
+	PerlIO_printf(Perl_debug_log, "(%s:%ld)\t", display_file, line);
     (void) PerlIO_vprintf(Perl_debug_log, pat, *args);
 #else
+    PERL_UNUSED_CONTEXT;
     PERL_UNUSED_ARG(pat);
     PERL_UNUSED_ARG(args);
 #endif /* DEBUGGING */
@@ -131,6 +140,7 @@ 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_CONTEXT;
     PERL_UNUSED_ARG(stack_base);
     PERL_UNUSED_ARG(stack_min);
     PERL_UNUSED_ARG(stack_max);
@@ -198,8 +208,8 @@ Perl_deb_stack_all(pTHX)
     si_ix=0;
     for (;;)
     {
-        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];
+        const size_t 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);
@@ -223,11 +233,9 @@ Perl_deb_stack_all(pTHX)
 		 */
 
 		I32 i, stack_min, stack_max, mark_min, mark_max;
-		const PERL_CONTEXT *cx_n;
+		const PERL_CONTEXT *cx_n = NULL;
 		const PERL_SI *si_n;
 
-		cx_n = Null(PERL_CONTEXT*);
-
 		/* there's a separate stack per SI, so only search
 		 * this one */
 
@@ -255,7 +263,7 @@ Perl_deb_stack_all(pTHX)
 
 		si_n = si;
 		i = ix;
-		cx_n = Null(PERL_CONTEXT*);
+		cx_n = NULL;
 		for (;;) {
 		    i++;
 		    if (i > si_n->si_cxix) {
@@ -306,6 +314,8 @@ Perl_deb_stack_all(pTHX)
     } /* next stackinfo */
 
     PerlIO_printf(Perl_debug_log, "\n");
+#else
+    PERL_UNUSED_CONTEXT;
 #endif /* DEBUGGING */
 }