ncurses 5.6 - patch 20080925

[ncurses.git] / ncurses / base / tries.c

diff --git a/ncurses/base/tries.c b/ncurses/base/tries.c
index c00ef20b7d828ade9c44d75bfd6302d037f33495..c4263c7e50eb22aad5dd88234c837d5e0cabbf3b 100644 (file)
--- a/ncurses/base/tries.c
+++ b/ncurses/base/tries.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2007,2008 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,7 +39,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: tries.c,v 1.24 2007/04/07 17:14:27 tom Exp $")
+MODULE_ID("$Id: tries.c,v 1.27 2008/08/16 19:22:55 tom Exp $")
 
 /*
  * Expand a keycode into the string that it corresponds to, returning null if
@@ -68,11 +68,13 @@ _nc_expand_try(TRIES * tree, unsigned code, int *count, size_t len)
        }
     }
     if (result != 0) {
-       if (ptr != 0 && (result[len] = ptr->ch) == 0)
+       if (ptr != 0 && (result[len] = (char) ptr->ch) == 0)
            *((unsigned char *) (result + len)) = 128;
 #ifdef TRACE
-       if (len == 0 && _nc_tracing != 0)
-           _tracef("expand_key %s %s", _tracechar(code), _nc_visbuf(result));
+       if (len == 0 && USE_TRACEF(TRACE_MAXIMUM)) {
+           _tracef("expand_key %s %s", _nc_tracechar(SP, code), _nc_visbuf(result));
+           _nc_unlock_global(tracef);
+       }
 #endif
     }
     return result;