[Xymon-developer] SF.net SVN: xymon:[6746] trunk

[<st...@us...>]

Revision: 6746
          http://xymon.svn.sourceforge.net/xymon/?rev=6746&view=rev
Author:   storner
Date:     2011-09-04 06:02:41 +0000 (Sun, 04 Sep 2011)
Log Message:
-----------
Library tree function: Drop the rbtr code, switch to own very plain xtree-code (missed two files in rev 6745)

Revision Links:
--------------
    http://xymon.svn.sourceforge.net/xymon/?rev=6745&view=rev

Modified Paths:
--------------
    trunk/README
    trunk/xymongen/util.c

Modified: trunk/README
===================================================================
--- trunk/README	2011-09-04 06:01:06 UTC (rev 6745)
+++ trunk/README	2011-09-04 06:02:41 UTC (rev 6746)
@@ -71,12 +71,7 @@
   in Xymon was taken from the "mutt" mail client sources, so 
   some changes were done by Thomas Roessler <roe...@do...>.
 
-* The lib/rbtr.c and lib/rbtr.h files are by Thomas Nieman,
-  who has released them into the public domain.
-  http://www.epaperpress.com/sortsearch/rbt.html
-  http://www.epaperpress.com/sortsearch/title.html
 
-
 Support
 -------
 There is an open mailing list for discussing Xymon, asking

Modified: trunk/xymongen/util.c
===================================================================
--- trunk/xymongen/util.c	2011-09-04 06:01:06 UTC (rev 6745)
+++ trunk/xymongen/util.c	2011-09-04 06:02:41 UTC (rev 6746)
@@ -26,9 +26,9 @@
 
 char *htmlextension = ".html"; /* Filename extension for generated HTML files */
 
-static RbtHandle hosttree;
+static void * hosttree;
 static int havehosttree = 0;
-static RbtHandle columntree;
+static void * columntree;
 static int havecolumntree = 0;
 
 char *hostpage_link(host_t *host)
@@ -130,14 +130,14 @@
 
 host_t *find_host(char *hostname)
 {
-	RbtIterator handle;
+	xtreePos_t handle;
 
 	if (havehosttree == 0) return NULL;
 
 	/* Search for the host */
-	handle = rbtFind(hosttree, hostname);
-	if (handle != rbtEnd(hosttree)) {
-		hostlist_t *entry = (hostlist_t *)gettreeitem(hosttree, handle);
+	handle = xtreeFind(hosttree, hostname);
+	if (handle != xtreeEnd(hosttree)) {
+		hostlist_t *entry = (hostlist_t *)xtreeData(hosttree, handle);
 		return (entry ? entry->hostentry : NULL);
 	}
 	
@@ -151,14 +151,14 @@
 
 hostlist_t *find_hostlist(char *hostname)
 {
-	RbtIterator handle;
+	xtreePos_t handle;
 
 	if (havehosttree == 0) return NULL;
 
 	/* Search for the host */
-	handle = rbtFind(hosttree, hostname);
-	if (handle != rbtEnd(hosttree)) {
-		hostlist_t *entry = (hostlist_t *)gettreeitem(hosttree, handle);
+	handle = xtreeFind(hosttree, hostname);
+	if (handle != xtreeEnd(hosttree)) {
+		hostlist_t *entry = (hostlist_t *)xtreeData(hosttree, handle);
 		return entry;
 	}
 	
@@ -168,22 +168,22 @@
 void add_to_hostlist(hostlist_t *rec)
 {
 	if (havehosttree == 0) {
-		hosttree = rbtNew(name_compare);
+		hosttree = xtreeNew(strcasecmp);
 		havehosttree = 1;
 	}
 
-	rbtInsert(hosttree, rec->hostentry->hostname, rec);
+	xtreeAdd(hosttree, rec->hostentry->hostname, rec);
 }
 
-static RbtIterator hostlistwalk;
+static xtreePos_t hostlistwalk;
 hostlist_t *hostlistBegin(void)
 {
 	if (havehosttree == 0) return NULL;
 
-	hostlistwalk = rbtBegin(hosttree);
+	hostlistwalk = xtreeFirst(hosttree);
 
-	if (hostlistwalk != rbtEnd(hosttree)) {
-		return (hostlist_t *)gettreeitem(hosttree, hostlistwalk);
+	if (hostlistwalk != xtreeEnd(hosttree)) {
+		return (hostlist_t *)xtreeData(hosttree, hostlistwalk);
 	}
 	else {
 		return NULL;
@@ -194,10 +194,10 @@
 {
 	if (havehosttree == 0) return NULL;
 
-	if (hostlistwalk != rbtEnd(hosttree)) hostlistwalk = rbtNext(hosttree, hostlistwalk);
+	if (hostlistwalk != xtreeEnd(hosttree)) hostlistwalk = xtreeNext(hosttree, hostlistwalk);
 
-	if (hostlistwalk != rbtEnd(hosttree)) {
-		return (hostlist_t *)gettreeitem(hosttree, hostlistwalk);
+	if (hostlistwalk != xtreeEnd(hosttree)) {
+		return (hostlist_t *)xtreeData(hosttree, hostlistwalk);
 	}
 	else {
 		return NULL;
@@ -207,17 +207,17 @@
 xymongen_col_t *find_or_create_column(char *testname, int create)
 {
 	xymongen_col_t *newcol = NULL;
-	RbtIterator handle;
+	xtreePos_t handle;
 
 	dbgprintf("find_or_create_column(%s)\n", textornull(testname));
 
 	if (havecolumntree == 0) {
-		columntree = rbtNew(name_compare);
+		columntree = xtreeNew(strcasecmp);
 		havecolumntree = 1;
 	}
 
-	handle = rbtFind(columntree, testname);
-	if (handle != rbtEnd(columntree)) newcol = (xymongen_col_t *)gettreeitem(columntree, handle);
+	handle = xtreeFind(columntree, testname);
+	if (handle != xtreeEnd(columntree)) newcol = (xymongen_col_t *)xtreeData(columntree, handle);
 
 	if (newcol == NULL) {
 		if (!create) return NULL;
@@ -227,7 +227,7 @@
 		newcol->listname = (char *)malloc(strlen(testname)+1+2); 
 		sprintf(newcol->listname, ",%s,", testname);
 
-		rbtInsert(columntree, newcol->name, newcol);
+		xtreeAdd(columntree, newcol->name, newcol);
 	}
 
 	return newcol;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.