ncurses 6.0 - patch 20160611

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

diff --git a/ncurses/base/tries.c b/ncurses/base/tries.c
index 3c396529d6545c224f99d0a687686347468b16f4..ad85d229213d76606bcba465176fca6ffe7e19da 100644 (file)
--- a/ncurses/base/tries.c
+++ b/ncurses/base/tries.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc.                        *
+ * Copyright (c) 1998-2009,2010 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,100 +39,107 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: tries.c,v 1.12 1999/03/01 23:23:59 tom Exp $")
+MODULE_ID("$Id: tries.c,v 1.30 2010/08/28 21:08:23 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.
  */
-char *_nc_expand_try(struct tries *tree, unsigned short code, int *count, size_t len)
+NCURSES_EXPORT(char *)
+_nc_expand_try(TRIES * tree, unsigned code, int *count, size_t len)
 {
-       struct tries *ptr = tree;
-       char *result = 0;
+    TRIES *ptr = tree;
+    char *result = 0;
 
-       if (code != 0) {
-               while (ptr != 0) {
-                       if ((result = _nc_expand_try(ptr->child, code, count, len + 1)) != 0) {
-                               break;
-                       }
-                       if (ptr->value == code) {
-                               *count -= 1;
-                               if (*count == -1) {
-                                       result = typeCalloc(char, len+2);
-                                       break;
-                               }
-                       }
-                       ptr = ptr->sibling;
+    if (code != 0) {
+       while (ptr != 0) {
+           if ((result = _nc_expand_try(ptr->child, code, count, len + 1))
+               != 0) {
+               break;
+           }
+           if (ptr->value == code) {
+               *count -= 1;
+               if (*count == -1) {
+                   result = typeCalloc(char, len + 2);
+                   break;
                }
+           }
+           ptr = ptr->sibling;
        }
-       if (result != 0) {
-               if ((result[len] = ptr->ch) == 0)
-                       *((unsigned char *)(result+len)) = 128;
+    }
+    if (result != 0) {
+       if (ptr != 0 && (result[len] = (char) ptr->ch) == 0)
+           *((unsigned char *) (result + len)) = 128;
 #ifdef TRACE
-               if (len == 0)
-                       _tracef("expand_key %s %s", _trace_key(code), _nc_visbuf(result));
-#endif
+       if (len == 0 && USE_TRACEF(TRACE_MAXIMUM)) {
+           _tracef("expand_key %s %s",
+                   _nc_tracechar(CURRENT_SCREEN, (int) code),
+                   _nc_visbuf(result));
+           _nc_unlock_global(tracef);
        }
-       return result;
+#endif
+    }
+    return result;
 }
 
 /*
  * Remove a code from the specified tree, freeing the unused nodes.  Returns
  * true if the code was found/removed.
  */
-int _nc_remove_key(struct tries **tree, unsigned short code)
+NCURSES_EXPORT(int)
+_nc_remove_key(TRIES ** tree, unsigned code)
 {
-       T((T_CALLED("_nc_remove_key(%p,%d)"), tree, code));
+    T((T_CALLED("_nc_remove_key(%p,%d)"), (void *) tree, code));
 
-       if (code == 0)
-               returnCode(FALSE);
-               
-       while (*tree != 0) {
-               if (_nc_remove_key(&(*tree)->child, code)) {
-                       returnCode(TRUE);
-               }
-               if ((*tree)->value == code) {
-                       if((*tree)->child) {
-                               /* don't cut the whole sub-tree */
-                               (*tree)->value = 0;
-                       } else {
-                               struct tries *to_free = *tree;
-                               *tree = (*tree)->sibling;
-                               free(to_free);
-                       }
-                       returnCode(TRUE);
-               }
-               tree = &(*tree)->sibling;
-       }
+    if (code == 0)
        returnCode(FALSE);
+
+    while (*tree != 0) {
+       if (_nc_remove_key(&(*tree)->child, code)) {
+           returnCode(TRUE);
+       }
+       if ((*tree)->value == code) {
+           if ((*tree)->child) {
+               /* don't cut the whole sub-tree */
+               (*tree)->value = 0;
+           } else {
+               TRIES *to_free = *tree;
+               *tree = (*tree)->sibling;
+               free(to_free);
+           }
+           returnCode(TRUE);
+       }
+       tree = &(*tree)->sibling;
+    }
+    returnCode(FALSE);
 }
 
 /*
  * Remove a string from the specified tree, freeing the unused nodes.  Returns
  * true if the string was found/removed.
  */
-int _nc_remove_string(struct tries **tree, char *string)
+NCURSES_EXPORT(int)
+_nc_remove_string(TRIES ** tree, const char *string)
 {
-       T((T_CALLED("_nc_remove_string(%p,%s)"), tree, _nc_visbuf(string)));
+    T((T_CALLED("_nc_remove_string(%p,%s)"), (void *) tree, _nc_visbuf(string)));
+
+    if (string == 0 || *string == 0)
+       returnCode(FALSE);
 
-       if (string == 0 || *string == 0)
+    while (*tree != 0) {
+       if (UChar((*tree)->ch) == UChar(*string)) {
+           if (string[1] != 0)
+               returnCode(_nc_remove_string(&(*tree)->child, string + 1));
+           if ((*tree)->child == 0) {
+               TRIES *to_free = *tree;
+               *tree = (*tree)->sibling;
+               free(to_free);
+               returnCode(TRUE);
+           } else {
                returnCode(FALSE);
-               
-       while (*tree != 0) {
-               if ((unsigned char)(*tree)->ch == (unsigned char)*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;
-                               *tree = (*tree)->sibling;
-                               free(to_free);
-                       }
-                       returnCode(TRUE);
-               }
-               tree = &(*tree)->sibling;
+           }
        }
-       returnCode(FALSE);
+       tree = &(*tree)->sibling;
+    }
+    returnCode(FALSE);
 }