ncurses 5.6 - patch 20070421

[ncurses.git] / ncurses / trace / lib_tracedmp.c

diff --git a/ncurses/trace/lib_tracedmp.c b/ncurses/trace/lib_tracedmp.c
index 41739a92527c3578ba8e33a7220f80c78b1822e7..536231364085c96b601da173df2432bf0198123b 100644 (file)
--- a/ncurses/trace/lib_tracedmp.c
+++ b/ncurses/trace/lib_tracedmp.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -39,15 +39,16 @@
 #include <curses.priv.h>
 #include <ctype.h>
 
-MODULE_ID("$Id: lib_tracedmp.c,v 1.27 2006/10/14 20:43:31 tom Exp $")
+MODULE_ID("$Id: lib_tracedmp.c,v 1.28 2007/04/21 21:10:54 tom Exp $")
 
 #ifdef TRACE
+
+#define my_buffer _nc_globals.tracedmp_buf
+#define my_length _nc_globals.tracedmp_used
+
 NCURSES_EXPORT(void)
 _tracedump(const char *name, WINDOW *win)
 {
-    static char *buf = 0;
-    static size_t used = 0;
-
     int i, j, n, width;
 
     /* compute narrowest possible display width */
@@ -66,13 +67,13 @@ _tracedump(const char *name, WINDOW *win)
     }
     if (width < win->_maxx)
        ++width;
-    if (++width + 1 > (int) used) {
-       used = 2 * (width + 1);
-       buf = typeRealloc(char, used, buf);
+    if (++width + 1 > (int) my_length) {
+       my_length = 2 * (width + 1);
+       my_buffer = typeRealloc(char, my_length, my_buffer);
     }
 
     for (n = 0; n <= win->_maxy; ++n) {
-       char *ep = buf;
+       char *ep = my_buffer;
        bool haveattrs, havecolors;
 
        /*
@@ -107,7 +108,7 @@ _tracedump(const char *name, WINDOW *win)
                break;
            }
        if (havecolors) {
-           ep = buf;
+           ep = my_buffer;
            for (j = 0; j < width; ++j) {
                int pair = GetPair(win->_line[n].text[j]);
                if (pair >= 52)
@@ -123,7 +124,7 @@ _tracedump(const char *name, WINDOW *win)
            }
            ep[j] = '\0';
            _tracef("%*s[%2d]%*s='%s'", (int) strlen(name),
-                   "colors", n, 8, " ", buf);
+                   "colors", n, 8, " ", my_buffer);
        }
 
        for (i = 0; i < 4; ++i) {
@@ -137,20 +138,20 @@ _tracedump(const char *name, WINDOW *win)
                    break;
                }
            if (haveattrs) {
-               ep = buf;
+               ep = my_buffer;
                for (j = 0; j < width; ++j)
                    ep[j] = hex[(AttrOf(win->_line[n].text[j]) & mask) >>
                                ((i + 4) * 4)];
                ep[j] = '\0';
                _tracef("%*s%d[%2d]%*s='%s'", (int) strlen(name) -
-                       1, "attrs", i, n, 8, " ", buf);
+                       1, "attrs", i, n, 8, " ", my_buffer);
            }
        }
     }
 #if NO_LEAKS
-    free(buf);
-    buf = 0;
-    used = 0;
+    free(my_buffer);
+    my_buffer = 0;
+    my_length = 0;
 #endif
 }