From e32f54b297587291d2b51419a2f8387e823bf0fb Mon Sep 17 00:00:00 2001
From: Georg Hopp <georg@steffers.org>
Date: Sat, 5 Jul 2014 00:49:04 +0100
Subject: [PATCH] some small fixes

---
 include/tr/tree_macros.h | 57 ++++++++++++++++++++--------------------
 src/memory.c             |  3 ++-
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/include/tr/tree_macros.h b/include/tr/tree_macros.h
index 540ce58..e0e2611 100644
--- a/include/tr/tree_macros.h
+++ b/include/tr/tree_macros.h
@@ -32,14 +32,12 @@
 #define TR_TREE_CHILD(node) \
 	(NULL==TR_TREE_RIGHT((node))?TR_TREE_LEFT((node)):TR_TREE_RIGHT((node)))
 
-#define TR_TREE_SIBLING(node)               \
-	(NULL!=TR_TREE_PARENT((node))?          \
-	 ((node)==TR_TREE_PARENT((node))->left? \
-	  TR_TREE_PARENT((node))->right:        \
-	  TR_TREE_PARENT((node))->left):        \
-	 NULL)
-
-#define TR_TREE_GRANDPARENT(node)	(TR_TREE_PARENT((node))->parent)
+#define TR_TREE_SIBLING(node)       \
+    (NULL!=(node)->parent?          \
+     ((node)==(node)->parent->left? \
+      (node)->parent->right:        \
+      (node)->parent->left):        \
+     NULL)
 
 #define TR_TREE_UNCLE(node)                           \
 	((node)->parent == (node)->parent->parent->left   \
@@ -110,31 +108,31 @@ typedef enum {rbBlack=1, rbRed=2} TR_rbColor;
  * it before using this macro.
  * Also be aware that found needs to be a valid lvalue and an integer.
  */
-#define TR_TREE_FIND(node, search, found, comp)          \
-	(found) = -1;                                        \
-	if ((node)) {                                        \
-		while(1) {                                       \
-			(found) = (comp)((node)->data, (search));    \
-			if (0 != (found)) {                          \
-				if (0 < (found)) {                       \
-					if (! (node)->left) break;           \
-					(node) = (node)->left;               \
-				} else {                                 \
-					if (! (node)->right) break;          \
-					(node) = (node)->right;              \
-				}                                        \
-			} else {                                     \
-				break;                                   \
-			}                                            \
-		}                                                \
+#define TR_TREE_FIND(node, search, found, comp)       \
+	(found) = -1;                                     \
+	if ((node)) {                                     \
+		while (1) {                                   \
+			(found) = (comp)((node)->data, (search)); \
+			if (0 != (found)) {                       \
+				if (0 < (found)) {                    \
+					if (! (node)->left) break;        \
+					(node) = (node)->left;            \
+				} else {                              \
+					if (! (node)->right) break;       \
+					(node) = (node)->right;           \
+				}                                     \
+			} else {                                  \
+				break;                                \
+			}                                         \
+		}                                             \
 	}
 
 #define TR_TREE_BALANCE_DELETE_CASE1(node) \
-	if (NULL == TR_TREE_PARENT((node))) {    \
-		break;                               \
+	if (NULL == (node)->parent) {          \
+		break;                             \
 	}
 
-#define TR_TREE_BALANCE_DELETE_CASE2(root, node, sibling) \
+#define TR_TREE_BALANCE_DELETE_CASE2(root, node, sibling)   \
 	if (NULL != (sibling) && rbRed == (sibling)->color) {   \
 		(node)->parent->color = rbRed;                      \
 		(sibling)->color      = rbBlack;                    \
@@ -216,6 +214,7 @@ typedef enum {rbBlack=1, rbRed=2} TR_rbColor;
 #define TR_TREE_BALANCE_DELETE(root, node, sibling)              \
 	while(1) {                                                   \
 		TR_TREE_BALANCE_DELETE_CASE1((node))                     \
+		sibling = TR_TREE_SIBLING(node);                         \
 		TR_TREE_BALANCE_DELETE_CASE2((root), (node), (sibling))  \
 		TR_TREE_BALANCE_DELETE_CASE34((root), (node), (sibling)) \
 		TR_TREE_BALANCE_DELETE_CASE5((root), (node), (sibling))  \
@@ -224,7 +223,7 @@ typedef enum {rbBlack=1, rbRed=2} TR_rbColor;
 	}
 
 #define TR_TREE_BALANCE_INSERT_CASE1(node) \
-	if (NULL == TR_TREE_PARENT((node))) {  \
+	if (NULL == (node)->parent) {          \
 		(node)->color = rbBlack;           \
 		break;                             \
 	}
diff --git a/src/memory.c b/src/memory.c
index d70ff53..686fb50 100644
--- a/src/memory.c
+++ b/src/memory.c
@@ -98,6 +98,7 @@ newElement(size_t size)
     return element;
 }
 
+#ifdef MEM_OPT
 static
 int
 _memSegmentFindCompare(const void * a, const void * b)
@@ -290,7 +291,6 @@ deleteElement(struct memSegment ** tree, size_t size)
         return del_node;
     }
 
-	s = TR_TREE_SIBLING(node);
 	TR_TREE_BALANCE_DELETE(tree, node, s);
  
     return del_node;
@@ -365,6 +365,7 @@ segmentFree(struct memSegment * segment, int depth)
         segment = next;
     }
 }
+#endif
 
 void *
 TR_reference(void * mem)