Integrate thrperl 5.003->5.004.

[p5sagit/p5-mst-13.2.git] / deb.c

diff --git a/deb.c b/deb.c
index 729c47e..01463c9 100644 (file)
--- a/deb.c
+++ b/deb.c
@@ -1,6 +1,6 @@
 /*    deb.c
  *
- *    Copyright (c) 1991-1994, Larry Wall
+ *    Copyright (c) 1991-1997, Larry Wall
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
@@ -32,30 +32,30 @@ deb(pat,a1,a2,a3,a4,a5,a6,a7,a8)
     GV* gv = curcop->cop_filegv;
 
 #ifdef USE_THREADS
-    fprintf(stderr,"0x%lx (%s:%ld)\t",
-       (unsigned long) thr,
-       SvTYPE(gv) == SVt_PVGV ? SvPVX(GvSV(gv)) : "<free>",
-       (long)curcop->cop_line);
+    PerlIO_printf(Perl_debug_log,"0x%lx (%s:%ld)\t",
+                 (unsigned long) thr,
+                 SvTYPE(gv) == SVt_PVGV ? SvPVX(GvSV(gv)) : "<free>",
+                 (long)curcop->cop_line);
 #else
-    fprintf(stderr,"(%s:%ld)\t",
+    PerlIO_printf(Perl_debug_log, "(%s:%ld)\t",
        SvTYPE(gv) == SVt_PVGV ? SvPVX(GvSV(gv)) : "<free>",
        (long)curcop->cop_line);
 #endif /* USE_THREADS */
     for (i=0; i<dlevel; i++)
-       fprintf(stderr,"%c%c ",debname[i],debdelim[i]);
-    fprintf(stderr,pat,a1,a2,a3,a4,a5,a6,a7,a8);
+       PerlIO_printf(Perl_debug_log, "%c%c ",debname[i],debdelim[i]);
+    PerlIO_printf(Perl_debug_log, pat,a1,a2,a3,a4,a5,a6,a7,a8);
 }
 
 #else /* !defined(I_STDARG) && !defined(I_VARARGS) */
 
 #  ifdef I_STDARG
 void
-deb(char *pat, ...)
+deb(const char *pat, ...)
 #  else
 /*VARARGS1*/
 void
 deb(pat, va_alist)
-    char *pat;
+    const char *pat;
     va_dcl
 #  endif
 {
@@ -65,24 +65,24 @@ deb(pat, va_alist)
     GV* gv = curcop->cop_filegv;
 
 #ifdef USE_THREADS
-    fprintf(stderr,"0x%lx (%s:%ld)\t",
-       (unsigned long) thr,
-       SvTYPE(gv) == SVt_PVGV ? SvPVX(GvSV(gv)) : "<free>",
-       (long)curcop->cop_line);
+    PerlIO_printf(Perl_debug_log, "0x%lx (%s:%ld)\t",
+                 (unsigned long) thr,
+                 SvTYPE(gv) == SVt_PVGV ? SvPVX(GvSV(gv)) : "<free>",
+                 (long)curcop->cop_line);
 #else
-    fprintf(stderr,"(%s:%ld)\t",
+    PerlIO_printf(Perl_debug_log, "(%s:%ld)\t",
        SvTYPE(gv) == SVt_PVGV ? SvPVX(GvSV(gv)) : "<free>",
        (long)curcop->cop_line);
 #endif /* USE_THREADS */
     for (i=0; i<dlevel; i++)
-       fprintf(stderr,"%c%c ",debname[i],debdelim[i]);
+       PerlIO_printf(Perl_debug_log, "%c%c ",debname[i],debdelim[i]);
 
 #  ifdef I_STDARG
     va_start(args, pat);
 #  else
     va_start(args);
 #  endif
-    (void) vfprintf(stderr,pat,args);
+    (void) PerlIO_vprintf(Perl_debug_log,pat,args);
     va_end( args );
 }
 #endif /* !defined(I_STDARG) && !defined(I_VARARGS) */
@@ -99,13 +99,13 @@ I32
 debstackptrs()
 {
     dTHR;
-    fprintf(stderr, "%8lx %8lx %8ld %8ld %8ld\n",
-       (unsigned long)stack, (unsigned long)stack_base,
+    PerlIO_printf(Perl_debug_log, "%8lx %8lx %8ld %8ld %8ld\n",
+       (unsigned long)curstack, (unsigned long)stack_base,
        (long)*markstack_ptr, (long)(stack_sp-stack_base),
        (long)(stack_max-stack_base));
-    fprintf(stderr, "%8lx %8lx %8ld %8ld %8ld\n",
-       (unsigned long)mainstack, (unsigned long)AvARRAY(stack),
-       (long)mainstack, (long)AvFILL(stack), (long)AvMAX(stack));
+    PerlIO_printf(Perl_debug_log, "%8lx %8lx %8ld %8ld %8ld\n",
+       (unsigned long)mainstack, (unsigned long)AvARRAY(curstack),
+       (long)mainstack, (long)AvFILL(curstack), (long)AvMAX(curstack));
     return 0;
 }
 
@@ -125,29 +125,29 @@ debstack()
            break;
 
 #ifdef USE_THREADS
-    fprintf(stderr, i ? "0x%lx    =>  ...  " : "0x%lx    =>  ",
-           (unsigned long) thr);
+    PerlIO_printf(Perl_debug_log, i ? "0x%lx    =>  ...  " : "0x%lx    =>  ",
+                 (unsigned long) thr);
 #else
-    fprintf(stderr, i ? "    =>  ...  " : "    =>  ");
+    PerlIO_printf(Perl_debug_log, i ? "    =>  ...  " : "    =>  ");
 #endif /* USE_THREADS */
     if (stack_base[0] != &sv_undef || stack_sp < stack_base)
-       fprintf(stderr, " [STACK UNDERFLOW!!!]\n");
+       PerlIO_printf(Perl_debug_log, " [STACK UNDERFLOW!!!]\n");
     do {
        ++i;
        if (markscan <= markstack_ptr && *markscan < i) {
            do {
                ++markscan;
-               putc('*', stderr);
+               PerlIO_putc(Perl_debug_log, '*');
            }
            while (markscan <= markstack_ptr && *markscan < i);
-           fprintf(stderr, "  ");
+           PerlIO_printf(Perl_debug_log, "  ");
        }
        if (i > top)
            break;
-       fprintf(stderr, "%-4s  ", SvPEEK(stack_base[i]));
+       PerlIO_printf(Perl_debug_log, "%-4s  ", SvPEEK(stack_base[i]));
     }
     while (1);
-    fprintf(stderr, "\n");
+    PerlIO_printf(Perl_debug_log, "\n");
     return 0;
 }
 #else