Imported Upstream version 1.7.6p1

[debian/sudo] / redblack.c

diff --git a/redblack.c b/redblack.c
index 95ac095b05f7f4d99fbdf662805caf73ad8f6558..fb3611b2d06004e0c1707d869246e4a6cd25474c 100644 (file)
--- a/redblack.c
+++ b/redblack.c
@@ -110,7 +110,7 @@ rbcreate(compar)
     tree->root.color = black;
     tree->root.data = NULL;
 
-    return(tree);
+    return tree;
 }
 
 /*
@@ -181,7 +181,7 @@ rbinsert(tree, data)
     while (node != rbnil(tree)) {
        parent = node;
        if ((res = tree->compar(data, node->data)) == 0)
-           return(node);
+           return node;
        node = res < 0 ? node->left : node->right;
     }
 
@@ -255,7 +255,7 @@ rbinsert(tree, data)
        }
     }
     rbfirst(tree)->color = black;      /* first node is always black */
-    return(NULL);
+    return NULL;
 }
 
 /*
@@ -272,10 +272,10 @@ rbfind(tree, key)
 
     while (node != rbnil(tree)) {
        if ((res = tree->compar(key, node->data)) == 0)
-           return(node);
+           return node;
        node = res < 0 ? node->left : node->right;
     }
-    return(NULL);
+    return NULL;
 }
 
 /*
@@ -296,19 +296,19 @@ rbapply_node(tree, node, func, cookie, order)
     if (node != rbnil(tree)) {
        if (order == preorder)
            if ((error = func(node->data, cookie)) != 0)
-               return(error);
+               return error;
        if ((error = rbapply_node(tree, node->left, func, cookie, order)) != 0)
-           return(error);
+           return error;
        if (order == inorder)
            if ((error = func(node->data, cookie)) != 0)
-               return(error);
+               return error;
        if ((error = rbapply_node(tree, node->right, func, cookie, order)) != 0)
-           return(error);
+           return error;
        if (order == postorder)
            if ((error = func(node->data, cookie)) != 0)
-               return(error);
+               return error;
     }
-    return (0);
+    return 0;
 }
 
 /*
@@ -331,7 +331,7 @@ rbsuccessor(tree, node)
        if (succ == rbroot(tree))
            succ = rbnil(tree);
     }
-    return(succ);
+    return succ;
 }
 
 /*
@@ -404,7 +404,7 @@ void *rbdelete(tree, z)
     }
     free(z); 
     
-    return (data);
+    return data;
 }
 
 /*