label: remove unused 'rtp' parameter to 'RTreeNewNode'

diff --git a/lib/label/index.c b/lib/label/index.c
index 108061b4e5dc40818585b35b9d9f16b6bdac8e3a..bc3869cbebb4f800f62582b486da04102780b621 100644 (file)
--- a/lib/label/index.c
+++ b/lib/label/index.c
@@ -61,7 +61,7 @@ RTree_t *RTreeOpen()
 /* Make a new index, empty.  Consists of a single node. */
 Node_t *RTreeNewIndex(RTree_t * rtp)
 {
-    Node_t *x = RTreeNewNode(rtp);
+    Node_t *x = RTreeNewNode();
     x->level = 0;              /* leaf */
     return x;
 }
@@ -199,7 +199,7 @@ int RTreeInsert(RTree_t * rtp, Rect_t * r, void *data, Node_t ** n, int level)
 
     if (RTreeInsert2(rtp, r, data, *n, &newnode, level)) {     /* root was split */
 
-       Node_t *newroot = RTreeNewNode(rtp);    /* grow a new root, make tree taller */
+       Node_t *newroot = RTreeNewNode();       /* grow a new root, make tree taller */
        newroot->level = (*n)->level + 1;
        b.rect = NodeCover(*n);
        b.child = *n;

diff --git a/lib/label/node.c b/lib/label/node.c
index 812d7296cef1c79057cd0aaf019e849f3e8386c8..dc1a5674ac663523ac00b078fbc9a9f9692f1c75 100644 (file)
--- a/lib/label/node.c
+++ b/lib/label/node.c
@@ -19,8 +19,7 @@
 
 /* Make a new node and initialize to have all branch cells empty.
 */
-Node_t *RTreeNewNode(RTree_t * rtp)
-{
+Node_t *RTreeNewNode(void) {
     Node_t *n = malloc(sizeof(Node_t));
     InitNode(n);
     return n;

diff --git a/lib/label/node.h b/lib/label/node.h
index 3892ed6e3b6e0c32474017fa094542dfdf09306e..f1d6c4077370dfff8ddb9adf3d05bbcf2cb148c3 100644 (file)
--- a/lib/label/node.h
+++ b/lib/label/node.h
@@ -34,7 +34,7 @@ int PickBranch(Rect_t *, Node_t *);
 int AddBranch(RTree_t *, Branch_t *, Node_t *, Node_t **);
 void DisconBranch(Node_t *, int);
 void PrintBranch(int, Branch_t *);
-Node_t *RTreeNewNode(RTree_t *);
+Node_t *RTreeNewNode(void);
 #ifdef RTDEBUG
 void PrintNode(Node_t * n);
 void PrintBranch(int i, Branch_t * b);

diff --git a/lib/label/split.q.c b/lib/label/split.q.c
index f5af9a16cc780f62dcf935254501ad27acf0c6cf..57d7c57eb9cdad054ddf38b47f5b05c848505411 100644 (file)
--- a/lib/label/split.q.c
+++ b/lib/label/split.q.c
@@ -61,7 +61,7 @@ void SplitNode(RTree_t * rtp, Node_t * n, Branch_t * b, Node_t ** nn)
     MethodZero(rtp);
 
     /* put branches from buffer into 2 nodes according to chosen partition */
-    *nn = RTreeNewNode(rtp);
+    *nn = RTreeNewNode();
     (*nn)->level = n->level = level;
     LoadNodes(rtp, n, *nn, p);
     assert(n->count + (*nn)->count == NODECARD + 1);