From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Mon, 10 Jan 2022 00:16:21 +0000 (-0800)
Subject: late_bool: use C99 bools for boolean parameters
X-Git-Tag: 3.0.0~79^2~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7095438982326e5bffbffa7d43cc8af766c6b8dd;p=graphviz

late_bool: use C99 bools for boolean parameters
---

diff --git a/lib/circogen/blocktree.c b/lib/circogen/blocktree.c
index 6adae5479..1096880a7 100644
--- a/lib/circogen/blocktree.c
+++ b/lib/circogen/blocktree.c
@@ -153,7 +153,7 @@ static void find_blocks(Agraph_t * g, circ_state * state)
     }
     if (!root && state->N_root) {
 	for (n = agfstnode(g); n; n = agnxtnode(g, n)) {
-	    if (late_bool(ORIGN(n), state->N_root, 0)) {
+	    if (late_bool(ORIGN(n), state->N_root, false)) {
 		root = n;
 		break;
 	    }
diff --git a/lib/common/postproc.c b/lib/common/postproc.c
index 9ef367d57..2f9dba6f8 100644
--- a/lib/common/postproc.c
+++ b/lib/common/postproc.c
@@ -566,7 +566,7 @@ static void addXLabels(Agraph_t * gp)
 
     force = agfindgraphattr(gp, "forcelabels");
 
-    params.force = late_bool(gp, force, TRUE);
+    params.force = late_bool(gp, force, true);
     params.bb = bb;
     placeLabels(objs, n_objs, lbls, n_lbls, &params);
     if (Verbose)
diff --git a/lib/common/utils.c b/lib/common/utils.c
index 742e3e9d8..0b6dd91f1 100644
--- a/lib/common/utils.c
+++ b/lib/common/utils.c
@@ -135,12 +135,12 @@ char *late_nnstring(void *obj, attrsym_t * attr, char *def)
     return rv;
 }
 
-boolean late_bool(void *obj, attrsym_t * attr, int def)
+bool late_bool(void *obj, attrsym_t * attr, bool def)
 {
     if (attr == NULL)
 	return def;
 
-    return mapbool(agxget(obj, attr));
+    return mapbool(agxget(obj, attr)) != FALSE;
 }
 
 /* union-find */
diff --git a/lib/common/utils.h b/lib/common/utils.h
index 11ddc6366..01afc0f5a 100644
--- a/lib/common/utils.h
+++ b/lib/common/utils.h
@@ -77,7 +77,7 @@ UTILS_API int late_int(void *, Agsym_t *, int, int);
 UTILS_API double late_double(void *, Agsym_t *, double, double);
 UTILS_API char *late_nnstring(void *, Agsym_t *, char *);
 UTILS_API char *late_string(void *, Agsym_t *, char *);
-UTILS_API boolean late_bool(void *, Agsym_t *, int);
+UTILS_API bool late_bool(void *, Agsym_t *, bool);
 UTILS_API double get_inputscale(graph_t *g);
 
 UTILS_API Agnode_t *UF_find(Agnode_t *);