X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Fbase%2Ftries.c;h=402bd2f7aa0d84c7c56ff3232073be4ed5ce5686;hp=983a75ae788258bf833421ab25bd44ac52561930;hb=37babca07fea18b480155ef60ef302ca09fca152;hpb=e6c7286022d8a7a7ea7f15a6ffa7f9addb00e42d;ds=sidebyside

diff --git a/ncurses/base/tries.c b/ncurses/base/tries.c
index 983a75ae..402bd2f7 100644
--- 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.25 2007/09/29 20:37:13 tom Exp $")
+MODULE_ID("$Id: tries.c,v 1.28 2008/11/16 00:19:59 juergen 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 && USE_TRACEF(TRACE_MAXIMUM)) {
-	    _tracef("expand_key %s %s", _tracechar(code), _nc_visbuf(result));
+	    _tracef("expand_key %s %s",
+		    _nc_tracechar(CURRENT_SCREEN, code),
+		    _nc_visbuf(result));
 	    _nc_unlock_global(tracef);
 	}
 #endif