From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Sun, 19 Dec 2021 20:42:56 +0000 (-0800)
Subject: endpath: [nfc] take a C99 bool parameter instead of a boolean
X-Git-Tag: 3.0.0~119^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=87a3fae55dbe9a208c4239b45fc62bcd6ccc8c62;p=graphviz

endpath: [nfc] take a C99 bool parameter instead of a boolean
---

diff --git a/lib/common/render.h b/lib/common/render.h
index e4dcf638b..f537c580b 100644
--- a/lib/common/render.h
+++ b/lib/common/render.h
@@ -99,7 +99,7 @@ extern "C" {
     RENDER_API void emit_label(GVJ_t * job, emit_state_t emit_state, textlabel_t *);
     RENDER_API int emit_once(char *message);
     RENDER_API void emit_map_rect(GVJ_t *job, boxf b);
-    RENDER_API void endpath(path *, Agedge_t *, int, pathend_t *, boolean);
+    RENDER_API void endpath(path *, Agedge_t *, int, pathend_t *, bool);
     RENDER_API void epsf_init(node_t * n);
     RENDER_API void epsf_free(node_t * n);
     RENDER_API shape_desc *find_user_shape(const char *);
diff --git a/lib/common/splines.c b/lib/common/splines.c
index 8505aad79..12a766572 100644
--- a/lib/common/splines.c
+++ b/lib/common/splines.c
@@ -582,7 +582,7 @@ beginpath(path * P, edge_t * e, int et, pathend_t * endp, bool merge)
     }
 }
 
-void endpath(path * P, edge_t * e, int et, pathend_t * endp, boolean merge)
+void endpath(path * P, edge_t * e, int et, pathend_t * endp, bool merge)
 {
     int side, mask;
     node_t *n;
diff --git a/lib/dotgen/dotsplines.c b/lib/dotgen/dotsplines.c
index 744d988b0..68035683b 100644
--- a/lib/dotgen/dotsplines.c
+++ b/lib/dotgen/dotsplines.c
@@ -1394,7 +1394,7 @@ makeFlatEnd (graph_t* g, spline_info_t* sp, path* P, node_t* n, edge_t* e, pathe
     b = endp->nb = maximal_bbox(g, sp, n, NULL, e);
     endp->sidemask = TOP;
     if (isBegin) beginpath(P, e, FLATEDGE, endp, false);
-    else endpath(P, e, FLATEDGE, endp, FALSE);
+    else endpath(P, e, FLATEDGE, endp, false);
     b.UR.y = endp->boxes[endp->boxn - 1].UR.y;
     b.LL.y = endp->boxes[endp->boxn - 1].LL.y;
     b = makeregularend(b, TOP, ND_coord(n).y + GD_rank(g)[ND_rank(n)].ht2);
@@ -1412,7 +1412,7 @@ makeBottomFlatEnd (graph_t* g, spline_info_t* sp, path* P, node_t* n, edge_t* e,
     b = endp->nb = maximal_bbox(g, sp, n, NULL, e);
     endp->sidemask = BOTTOM;
     if (isBegin) beginpath(P, e, FLATEDGE, endp, false);
-    else endpath(P, e, FLATEDGE, endp, FALSE);
+    else endpath(P, e, FLATEDGE, endp, false);
     b.UR.y = endp->boxes[endp->boxn - 1].UR.y;
     b.LL.y = endp->boxes[endp->boxn - 1].LL.y;
     b = makeregularend(b, BOTTOM, ND_coord(n).y - GD_rank(g)[ND_rank(n)].ht2);
@@ -1879,7 +1879,7 @@ make_regular_edge(graph_t* g, spline_info_t* sp, path * P, edge_t ** edges, int
 	        continue;
 	    }
 	    hend.nb = maximal_bbox(g, sp, hn, e, ND_out(hn).list[0]);
-	    endpath(P, e, REGULAREDGE, &hend, spline_merge(aghead(e)));
+	    endpath(P, e, REGULAREDGE, &hend, spline_merge(aghead(e)) != FALSE);
 	    b = makeregularend(hend.boxes[hend.boxn - 1], TOP,
 	    	       ND_coord(hn).y + GD_rank(g)[ND_rank(hn)].ht2);
 	    if (b.LL.x < b.UR.x && b.LL.y < b.UR.y)
@@ -1929,7 +1929,8 @@ make_regular_edge(graph_t* g, spline_info_t* sp, path * P, edge_t ** edges, int
 	}
 	boxes_append(&boxes, rank_box(sp, g, ND_rank(tn)));
 	b = hend.nb = maximal_bbox(g, sp, hn, e, NULL);
-	endpath(P, hackflag ? &fwdedgeb.out : e, REGULAREDGE, &hend, spline_merge(aghead(e)));
+	endpath(P, hackflag ? &fwdedgeb.out : e, REGULAREDGE, &hend,
+	        spline_merge(aghead(e)) != FALSE);
 	b.UR.y = hend.boxes[hend.boxn - 1].UR.y;
 	b.LL.y = hend.boxes[hend.boxn - 1].LL.y;
 	b = makeregularend(b, TOP,