late_bool: use C99 bools for boolean parameters

diff --git a/lib/circogen/blocktree.c b/lib/circogen/blocktree.c
index 6adae54790b214b4e60d066e9137ba3c5669e81e..1096880a707c3801ae9bf2012be9c722f0fb4cea 100644 (file)
--- 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 9ef367d5729e8901095b4a63559c041bd32ed5dc..2f9dba6f819f046375595073b9e01466c7c4c64a 100644 (file)
--- 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 742e3e9d86faf541465749573d86d0b4c464907b..0b6dd91f1a51b6e834b809c9543cc2d3c0cabfa9 100644 (file)
--- 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 11ddc63665a0276a58664c970899592fc42e4da0..01afc0f5aa0999a9f513298bd9e5ec10d2ed5927 100644 (file)
--- 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 *);