diff options
Diffstat (limited to 'contrib/ncurses/ncurses/base/tries.c')
| -rw-r--r-- | contrib/ncurses/ncurses/base/tries.c | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/contrib/ncurses/ncurses/base/tries.c b/contrib/ncurses/ncurses/base/tries.c index fe7d93e..4edb731 100644 --- a/contrib/ncurses/ncurses/base/tries.c +++ b/contrib/ncurses/ncurses/base/tries.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998,2000,2001 Free Software Foundation, Inc. * + * Copyright (c) 1998-2003,2005 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,14 @@ #include <curses.priv.h> -MODULE_ID("$Id: tries.c,v 1.15 2001/12/16 00:50:40 tom Exp $") +MODULE_ID("$Id: tries.c,v 1.22 2005/11/26 20:09:18 tom Exp $") /* * Expand a keycode into the string that it corresponds to, returning null if * no match was found, otherwise allocating a string of the result. */ NCURSES_EXPORT(char *) -_nc_expand_try -(struct tries *tree, unsigned short code, int *count, size_t len) +_nc_expand_try(struct tries *tree, unsigned code, int *count, size_t len) { struct tries *ptr = tree; char *result = 0; @@ -72,7 +71,7 @@ _nc_expand_try if ((result[len] = ptr->ch) == 0) *((unsigned char *) (result + len)) = 128; #ifdef TRACE - if (len == 0) + if (len == 0 && _nc_tracing != 0) _tracef("expand_key %s %s", _tracechar(code), _nc_visbuf(result)); #endif } @@ -84,8 +83,7 @@ _nc_expand_try * true if the code was found/removed. */ NCURSES_EXPORT(int) -_nc_remove_key -(struct tries **tree, unsigned short code) +_nc_remove_key(struct tries **tree, unsigned code) { T((T_CALLED("_nc_remove_key(%p,%d)"), tree, code)); @@ -117,7 +115,7 @@ _nc_remove_key * true if the string was found/removed. */ NCURSES_EXPORT(int) -_nc_remove_string(struct tries **tree, char *string) +_nc_remove_string(struct tries **tree, const char *string) { T((T_CALLED("_nc_remove_string(%p,%s)"), tree, _nc_visbuf(string))); @@ -125,18 +123,17 @@ _nc_remove_string(struct tries **tree, char *string) returnCode(FALSE); while (*tree != 0) { - if ((unsigned char) (*tree)->ch == (unsigned char) *string) { + if (UChar((*tree)->ch) == UChar(*string)) { if (string[1] != 0) returnCode(_nc_remove_string(&(*tree)->child, string + 1)); - if ((*tree)->child) { - /* don't cut the whole sub-tree */ - (*tree)->value = 0; - } else { + if ((*tree)->child == 0) { struct tries *to_free = *tree; *tree = (*tree)->sibling; free(to_free); + returnCode(TRUE); + } else { + returnCode(FALSE); } - returnCode(TRUE); } tree = &(*tree)->sibling; } |
