From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Sun, 6 Mar 2022 03:26:00 +0000 (-0800)
Subject: topfish: remove unmutated 'cur_level'
X-Git-Tag: 4.0.0~186^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d0694c8420d75116f99c45945b2597f592c34ad2;p=graphviz

topfish: remove unmutated 'cur_level'

This file has a fairly strange structure where almost every use of `cur_level`
is actually referencing a local that shadows the global `cur_level`. The global
`cur_level` is never written to and remains 0 throughout execution, making it
somewhat useless.
---

diff --git a/lib/topfish/hierarchy.c b/lib/topfish/hierarchy.c
index 896b2ae0c..771ffb34d 100644
--- a/lib/topfish/hierarchy.c
+++ b/lib/topfish/hierarchy.c
@@ -26,8 +26,6 @@
 #include <common/arith.h>
 #include <topfish/hierarchy.h>
 
-static int cur_level = 0;
-
 /////////////////////////
 // Some utilities for  //
 // 'maxmatch(..)'      //
@@ -913,7 +911,7 @@ set_active_levels(Hierarchy * hierarchy, int *foci_nodes, int num_foci,
     ex_vtx_data *cgraph;
     int *cv2v;
     int v, u;
-    int min_level = cur_level;
+    int min_level = 0;
 
     graph = hierarchy->geom_graphs[min_level];	// finest graph
     n = hierarchy->nvtxs[min_level];
@@ -1086,7 +1084,7 @@ find_closest_active_node(Hierarchy * hierarchy, double x, double y,
 	{
 		min_dist = findClosestActiveNode(hierarchy, i, top_level, x, y,min_dist, &closest_node, &closest_node_level);
     }
-    *closest_fine_node =find_leftmost_descendant(hierarchy, closest_node,closest_node_level, cur_level);
+    *closest_fine_node =find_leftmost_descendant(hierarchy, closest_node,closest_node_level, 0);
 
     return min_dist;
 }