ncurses 5.6 - patch 20070407

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

diff --git a/ncurses/base/tries.c b/ncurses/base/tries.c
index fe7d93ed5e1012e730ea2c58c3936ed03ba84ee8..c00ef20b7d828ade9c44d75bfd6302d037f33495 100644 (file)
--- a/ncurses/base/tries.c
+++ b/ncurses/base/tries.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998,2000,2001 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,17 +39,16 @@
 
 #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.24 2007/04/07 17:14:27 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(TRIES * tree, unsigned code, int *count, size_t len)
 {
-    struct tries *ptr = tree;
+    TRIES *ptr = tree;
     char *result = 0;
 
     if (code != 0) {
@@ -69,10 +68,10 @@ _nc_expand_try
        }
     }
     if (result != 0) {
-       if ((result[len] = ptr->ch) == 0)
+       if (ptr != 0 && (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(TRIES ** tree, unsigned code)
 {
     T((T_CALLED("_nc_remove_key(%p,%d)"), tree, code));
 
@@ -101,7 +99,7 @@ _nc_remove_key
                /* don't cut the whole sub-tree */
                (*tree)->value = 0;
            } else {
-               struct tries *to_free = *tree;
+               TRIES *to_free = *tree;
                *tree = (*tree)->sibling;
                free(to_free);
            }
@@ -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(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 {
-               struct tries *to_free = *tree;
+           if ((*tree)->child == 0) {
+               TRIES *to_free = *tree;
                *tree = (*tree)->sibling;
                free(to_free);
+               returnCode(TRUE);
+           } else {
+               returnCode(FALSE);
            }
-           returnCode(TRUE);
        }
        tree = &(*tree)->sibling;
     }