ncurses 5.7 - patch 20091205

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

diff --git a/ncurses/trace/trace_tries.c b/ncurses/trace/trace_tries.c
index 7cb45b8878df6e259f54c23ccf54edaf086eed6e..c4274643c5e56fc5cb1d31f70f6683deb38aaf14 100644 (file)
--- a/ncurses/trace/trace_tries.c
+++ b/ncurses/trace/trace_tries.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1999-2001,2006 Free Software Foundation, Inc.              *
+ * Copyright (c) 1999-2008,2009 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            *
@@ -35,25 +35,27 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: trace_tries.c,v 1.11 2006/12/30 16:25:45 tom Exp $")
+MODULE_ID("$Id: trace_tries.c,v 1.15 2009/10/24 22:15:47 tom Exp $")
 
 #ifdef TRACE
-static unsigned char *buffer;
-static unsigned len;
+#define my_buffer _nc_globals.tracetry_buf
+#define my_length _nc_globals.tracetry_used
 
 static void
 recur_tries(TRIES * tree, unsigned level)
 {
-    if (level > len)
-       buffer = (unsigned char *) realloc(buffer, len = (level + 1) * 4);
+    if (level > my_length) {
+       my_length = (level + 1) * 4;
+       my_buffer = (unsigned char *) _nc_doalloc(my_buffer, my_length);
+    }
 
     while (tree != 0) {
-       if ((buffer[level] = tree->ch) == 0)
-           buffer[level] = 128;
-       buffer[level + 1] = 0;
+       if ((my_buffer[level] = tree->ch) == 0)
+           my_buffer[level] = 128;
+       my_buffer[level + 1] = 0;
        if (tree->value != 0) {
            _tracef("%5d: %s (%s)", tree->value,
-                   _nc_visbuf((char *) buffer), keyname(tree->value));
+                   _nc_visbuf((char *) my_buffer), keyname(tree->value));
        }
        if (tree->child)
            recur_tries(tree->child, level + 1);
@@ -64,13 +66,13 @@ recur_tries(TRIES * tree, unsigned level)
 NCURSES_EXPORT(void)
 _nc_trace_tries(TRIES * tree)
 {
-    buffer = typeMalloc(unsigned char, len = 80);
-    _tracef("BEGIN tries %p", tree);
+    my_buffer = typeMalloc(unsigned char, my_length = 80);
+    _tracef("BEGIN tries %p", (void *) tree);
     recur_tries(tree, 0);
-    _tracef(". . . tries %p", tree);
-    free(buffer);
+    _tracef(". . . tries %p", (void *) tree);
+    free(my_buffer);
 }
 
 #else
-empty_module(_nc_trace_tries)
+EMPTY_MODULE(_nc_trace_tries)
 #endif