Changeset 2296 in kBuild for trunk/src/kash/shfile.c

Timestamp:

Mar 1, 2009 1:54:30 AM (16 years ago)

Author:

bird

Message:

kash: avoid file steams in the trace code.

File:

• trunk/src/kash/shfile.c (modified) (5 diffs)

trunk/src/kash/shfile.c

@@ -43 +43 @@
 #endif
 
-#ifdef DEBUG
+#if defined(DEBUG) && defined(TRACE_VIA_STDIO)
 extern FILE *tracefile;
 #endif
@@ -150 +150 @@
         while (new_size < fdMin)
             new_size += SHFILE_GROW;
-        new_tab = sh_realloc(NULL, pfdtab->tab, new_size * sizeof(shfile));
+        new_tab = sh_realloc(shthread_get_shell(), pfdtab->tab, new_size * sizeof(shfile));
         if (new_tab)
         {
-            fd = i = pfdtab->size;
-            if (fd < fdMin)
-                fd = fdMin;
             for (i = pfdtab->size; i < new_size; i++)
             {
@@ -162 +159 @@
                 new_tab[i].native = -1;
             }
+
+            fd = pfdtab->size;
+            if (fd < fdMin)
+                fd = fdMin;
 
             pfdtab->tab = new_tab;
@@ -610 +611 @@
 #endif
 
-#ifdef DEBUG
+#if defined(DEBUG) && defined(TRACE_VIA_STDIO)
     if (tracefile)
+#endif
         TRACE2((NULL, "shfile_open(%p:{%s}, %#x, 0%o) -> %d [%d]\n", name, name, flags, mode, fd, errno));
-#endif
     return fd;
 }
@@ -999 +1000 @@
 
 #ifdef DEBUG
+# ifdef TRACE_VIA_STDIO
     if (tracefile)
+# endif
         switch (cmd)
         {