From 934ef671dbf0b5e65dee5f704703559b8da483fa Mon Sep 17 00:00:00 2001 From: Matthew Fernandez Date: Sat, 28 May 2022 10:30:24 -0700 Subject: [PATCH] label: remove unused 'rtp' parameter to 'RTreeNewNode' --- lib/label/index.c | 4 ++-- lib/label/node.c | 3 +-- lib/label/node.h | 2 +- lib/label/split.q.c | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/label/index.c b/lib/label/index.c index 108061b4e..bc3869cbe 100644 --- 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 812d7296c..dc1a5674a 100644 --- 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 3892ed6e3..f1d6c4077 100644 --- 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 f5af9a16c..57d7c57eb 100644 --- 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); -- 2.40.0