Changeset 1198 for trunk/src/kash/show.c

Timestamp:

Oct 6, 2007, 11:19:19 PM (18 years ago)

Author:

bird

Message:

moving globals into shinstance...

File:

• trunk/src/kash/show.c (modified) (9 diffs)

trunk/src/kash/show.c

@@ -276 +276 @@
 trputc(int c)
 {
-        if (debug != 1)
+        if (debug(psh) != 1)
                 return;
         putc(c, tracefile);
@@ -283 +283 @@
 
 void
-trace(const char *fmt, ...)
+trace(shinstance *psh, const char *fmt, ...)
 {
 #ifdef DEBUG
         va_list va;
 
-        if (debug != 1)
+        if (debug(psh) != 1)
                 return;
         fprintf(tracefile, "[%d] ", getpid());
@@ -298 +298 @@
 
 void
-tracev(const char *fmt, va_list va)
-{
-#ifdef DEBUG
-        if (debug != 1)
+tracev(shinstance *psh, const char *fmt, va_list va)
+{
+#ifdef DEBUG
+        if (debug(psh) != 1)
                 return;
         fprintf(tracefile, "[%d] ", getpid());
@@ -313 +313 @@
 trputs(const char *s)
 {
-        if (debug != 1)
+        if (debug(psh) != 1)
                 return;
         fputs(s, tracefile);
@@ -325 +325 @@
         char c;
 
-        if (debug != 1)
+        if (debug(psh) != 1)
                 return;
         putc('"', tracefile);
@@ -361 +361 @@
 
 void
-trargs(char **ap)
-{
-#ifdef DEBUG
-        if (debug != 1)
+trargs(shinstance *psh, char **ap)
+{
+#ifdef DEBUG
+        if (debug(psh) != 1)
                 return;
         while (*ap) {
@@ -386 +386 @@
 #endif
 
-        if (debug != 1) {
+        if (debug(psh) != 1) {
                 if (tracefile)
                         fflush(tracefile);
@@ -410 +410 @@
                 if (!freopen(s, "a", tracefile)) {
                         fprintf(stderr, "Can't re-open %s\n", s);
-                        debug = 0;
+                        debug(psh) = 0;
                         return;
                 }
@@ -416 +416 @@
                 if ((tracefile = fopen(s, "a")) == NULL) {
                         fprintf(stderr, "Can't open %s\n", s);
-                        debug = 0;
+                        debug(psh) = 0;
                         return;
                 }