X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fbtree%2Fbtree.c;h=636edbced8928d88060ca01adaa5d715ff30c282;hp=31982ec80efc6669aed259cef9c0c80202cad78e;hb=a8722345053b7cd860499aa31fd6bb414c120cc8;hpb=8f7447e48f6405a083919f3d6b591eb7dfbc6a9f

diff --git a/ccan/btree/btree.c b/ccan/btree/btree.c
index 31982ec8..636edbce 100644
--- a/ccan/btree/btree.c
+++ b/ccan/btree/btree.c
@@ -1,29 +1,24 @@
 /*
-	Copyright (c) 2010  Joseph A. Adams
-	All rights reserved.
-	
-	Redistribution and use in source and binary forms, with or without
-	modification, are permitted provided that the following conditions
-	are met:
-	1. Redistributions of source code must retain the above copyright
-	   notice, this list of conditions and the following disclaimer.
-	2. Redistributions in binary form must reproduce the above copyright
-	   notice, this list of conditions and the following disclaimer in the
-	   documentation and/or other materials provided with the distribution.
-	3. The name of the author may not be used to endorse or promote products
-	   derived from this software without specific prior written permission.
-	
-	THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-	IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-	OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-	IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-	INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-	NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-	DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-	THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-	(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-	THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ * Copyright (C) 2010 Joseph Adams <joeyadams3.14159@gmail.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
 
 #include "btree.h"
 
@@ -77,6 +72,7 @@ struct btree *btree_new(btree_search_t search)
 		node->depth = 0;
 	btree->root = node;
 	btree->search = search;
+	btree->multi = false;
 	return btree;
 }
 
@@ -86,6 +82,43 @@ void btree_delete(struct btree *btree)
 	free(btree);
 }
 
+bool btree_insert(struct btree *btree, const void *item)
+{
+	btree_iterator iter;
+	
+	if (btree_find_last(btree, item, iter) && !btree->multi)
+		return false;
+	
+	btree_insert_at(iter, item);
+	return true;
+}
+
+bool btree_remove(struct btree *btree, const void *key)
+{
+	btree_iterator iter;
+	bool success = false;
+	bool multi = btree->multi;
+	
+	do {
+		if (btree_find_first(btree, key, iter)) {
+			btree_remove_at(iter);
+			success = true;
+		}
+	} while (multi);
+	
+	return success;
+}
+
+void *btree_lookup(struct btree *btree, const void *key)
+{
+	btree_iterator iter;
+	
+	if (btree_find_first(btree, key, iter))
+		return iter->item;
+	
+	return NULL;
+}
+
 int btree_begin_end_lr(const struct btree *btree, btree_iterator iter, int lr)
 {
 	struct btree_node *node;
@@ -374,6 +407,17 @@ int btree_cmp_iters(const btree_iterator iter_a, const btree_iterator iter_b)
 	return 0;
 }
 
+/********************* Built-in ordering functions *******************/
+
+btree_search_implement
+(
+	btree_strcmp,
+	char*,
+	int c = strcmp(a, b),
+	c == 0,
+	c < 0
+)
+
 
 /************************* Private functions *************************/