X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Ftinfo%2Fadd_tries.c;h=29a1a60045b537411ef6642d6b724a72e4eb8a7c;hp=95a9e965c5a78e0e21b5796aa2b8f7570bfaa06f;hb=67ab4b308e932639a3a832052228d445c41c54b4;hpb=0eb88fc5281804773e2a0c7a488a4452463535ce

diff --git a/ncurses/tinfo/add_tries.c b/ncurses/tinfo/add_tries.c
index 95a9e965..29a1a600 100644
--- a/ncurses/tinfo/add_tries.c
+++ b/ncurses/tinfo/add_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            *
@@ -27,7 +27,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- *  Author: Thomas E. Dickey <dickey@clark.net> 1998                        *
+ *  Author: Thomas E. Dickey            1998-on                             *
  ****************************************************************************/
 
 /*
@@ -39,86 +39,83 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: add_tries.c,v 1.1 1998/11/08 00:04:18 tom Exp $")
+MODULE_ID("$Id: add_tries.c,v 1.10 2010/12/19 01:31:14 tom Exp $")
 
 #define SET_TRY(dst,src) if ((dst->ch = *src++) == 128) dst->ch = '\0'
 #define CMP_TRY(a,b) ((a)? (a == b) : (b == 128))
 
-void _nc_add_to_try(struct tries **tree, char *str, unsigned short code)
+NCURSES_EXPORT(int)
+_nc_add_to_try(TRIES ** tree, const char *str, unsigned code)
 {
-	static bool     out_of_memory = FALSE;
-	struct tries    *ptr, *savedptr;
-	unsigned char	*txt = (unsigned char *)str;
-
-	if (txt == 0 || *txt == '\0' || out_of_memory || code == 0)
-		return;
-
-	if ((*tree) != 0) {
-		ptr = savedptr = (*tree);
-
-		for (;;) {
-			unsigned char cmp = *txt;
-
-			while (!CMP_TRY(ptr->ch, cmp)
-			       &&  ptr->sibling != 0)
-				ptr = ptr->sibling;
-	
-			if (CMP_TRY(ptr->ch, cmp)) {
-				if (*(++txt) == '\0') {
-					ptr->value = code;
-					return;
-				}
-				if (ptr->child != 0)
-					ptr = ptr->child;
-				else
-					break;
-			} else {
-				if ((ptr->sibling = typeCalloc(struct tries,1)) == 0) {
-					out_of_memory = TRUE;
-					return;
-				}
-
-				savedptr = ptr = ptr->sibling;
-				SET_TRY(ptr,txt);
-				ptr->value = 0;
-
-				break;
-			}
-		} /* end for (;;) */
-	} else {   /* (*tree) == 0 :: First sequence to be added */
-		savedptr = ptr = (*tree) = typeCalloc(struct tries,1);
-
-		if (ptr == 0) {
-			out_of_memory = TRUE;
-			return;
+    TRIES *ptr, *savedptr;
+    unsigned const char *txt = (unsigned const char *) str;
+
+    T((T_CALLED("_nc_add_to_try(%p, %s, %u)"),
+       (void *) *tree, _nc_visbuf(str), code));
+    if (txt == 0 || *txt == '\0' || code == 0)
+	returnCode(ERR);
+
+    if ((*tree) != 0) {
+	ptr = savedptr = (*tree);
+
+	for (;;) {
+	    unsigned char cmp = *txt;
+
+	    while (!CMP_TRY(ptr->ch, cmp)
+		   && ptr->sibling != 0)
+		ptr = ptr->sibling;
+
+	    if (CMP_TRY(ptr->ch, cmp)) {
+		if (*(++txt) == '\0') {
+		    ptr->value = (unsigned short) code;
+		    returnCode(OK);
+		}
+		if (ptr->child != 0)
+		    ptr = ptr->child;
+		else
+		    break;
+	    } else {
+		if ((ptr->sibling = typeCalloc(TRIES, 1)) == 0) {
+		    returnCode(ERR);
 		}
 
-		SET_TRY(ptr,txt);
+		savedptr = ptr = ptr->sibling;
+		SET_TRY(ptr, txt);
 		ptr->value = 0;
-	}
 
-	    /* at this point, we are adding to the try.  ptr->child == 0 */
+		break;
+	    }
+	}			/* end for (;;) */
+    } else {			/* (*tree) == 0 :: First sequence to be added */
+	savedptr = ptr = (*tree) = typeCalloc(TRIES, 1);
 
-	while (*txt) {
-		ptr->child = typeCalloc(struct tries,1);
+	if (ptr == 0) {
+	    returnCode(ERR);
+	}
 
-		ptr = ptr->child;
+	SET_TRY(ptr, txt);
+	ptr->value = 0;
+    }
 
-		if (ptr == 0) {
-			out_of_memory = TRUE;
+    /* at this point, we are adding to the try.  ptr->child == 0 */
 
-			while ((ptr = savedptr) != 0) {
-				savedptr = ptr->child;
-				free(ptr);
-			}
+    while (*txt) {
+	ptr->child = typeCalloc(TRIES, 1);
 
-			return;
-		}
+	ptr = ptr->child;
 
-		SET_TRY(ptr,txt);
-		ptr->value = 0;
+	if (ptr == 0) {
+	    while ((ptr = savedptr) != 0) {
+		savedptr = ptr->child;
+		free(ptr);
+	    }
+	    returnCode(ERR);
 	}
 
-	ptr->value = code;
-	return;
+	SET_TRY(ptr, txt);
+	ptr->value = 0;
+    }
+
+    ptr->value = (unsigned short) code;
+    returnCode(OK);
 }