Merge tag 'upstream/1.2'

1 files changed, 10 insertions, 1 deletions

diff --git a/libsunavl.h b/libsunavl.h
index 4e0a2b4..658060e 100644
--- a/libsunavl.h
+++ b/libsunavl.h
@@ -28,6 +28,10 @@
  * Portions copyright 2013 Igor Pashev <pashev.igor@gmail.com>
  */
 
+/*
+ * Copyright (c) 2014 by Delphix. All rights reserved.
+ */
+
 /* Just a wrapper, but intended to be the only public interface */
 
 #ifndef _LIBSUNAVL_H
@@ -95,7 +99,7 @@ extern void avl_insert(avl_tree_t *tree, void *node, avl_index_t where);
  * Insert "new_data" in "tree" in the given "direction" either after
  * or before the data "here".
  *
- * This might be usefull for avl clients caching recently accessed
+ * This might be useful for avl clients caching recently accessed
  * data to avoid doing avl_find() again for insertion.
  *
  * new_data - new data to insert
@@ -185,6 +189,11 @@ extern int avl_update_lt(avl_tree_t *, void *);
 extern int avl_update_gt(avl_tree_t *, void *);
 
 /*
+ * Swaps the contents of the two trees.
+ */
+extern void avl_swap(avl_tree_t *tree1, avl_tree_t *tree2);
+
+/*
  * Return the number of nodes in the tree
  */
 extern size_t avl_numnodes(avl_tree_t *tree);