From: Matthew Fernandez Date: Sun, 19 Dec 2021 20:34:37 +0000 (-0800) Subject: graph_init: [nfc] take a C99 bool parameter instead of a boolean X-Git-Tag: 3.0.0~119^2~2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3080f545738efa2abdae4c04227be20e177e7a78;p=graphviz graph_init: [nfc] take a C99 bool parameter instead of a boolean --- diff --git a/cmd/tools/gvpack.c b/cmd/tools/gvpack.c index 904d8770c..19106563a 100644 --- a/cmd/tools/gvpack.c +++ b/cmd/tools/gvpack.c @@ -293,7 +293,7 @@ static void init_graph(Agraph_t *g, bool fill, GVC_t *gvc) { aginit (g, AGNODE, "Agnodeinfo_t", sizeof(Agnodeinfo_t), TRUE); aginit (g, AGEDGE, "Agedgeinfo_t", sizeof(Agedgeinfo_t), TRUE); GD_gvc(g) = gvc; - graph_init(g, FALSE); + graph_init(g, false); d = late_int(g, agfindgraphattr(g, "dim"), 2, 2); if (d != 2) { fprintf(stderr, "Error: graph %s has dim = %d (!= 2)\n", agnameof(g), diff --git a/lib/common/input.c b/lib/common/input.c index 9a78ba5c1..e3037648c 100644 --- a/lib/common/input.c +++ b/lib/common/input.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include @@ -618,7 +619,7 @@ static void setRatio(graph_t * g) cgraph requires */ -void graph_init(graph_t * g, boolean use_rankdir) +void graph_init(graph_t * g, bool use_rankdir) { char *p; double xf; diff --git a/lib/common/render.h b/lib/common/render.h index 3586ba3a5..e4dcf638b 100644 --- a/lib/common/render.h +++ b/lib/common/render.h @@ -86,7 +86,7 @@ extern "C" { RENDER_API char* charsetToStr (int c); RENDER_API pointf coord(node_t * n); RENDER_API void do_graph_label(graph_t * sg); - RENDER_API void graph_init(graph_t * g, boolean use_rankdir); + RENDER_API void graph_init(graph_t * g, bool use_rankdir); RENDER_API void graph_cleanup(graph_t * g); RENDER_API int dotneato_args_initialize(GVC_t * gvc, int, char **); RENDER_API int dotneato_usage(int); diff --git a/lib/gvc/gvlayout.c b/lib/gvc/gvlayout.c index ea1d28ecb..a9f65cc7b 100644 --- a/lib/gvc/gvlayout.c +++ b/lib/gvc/gvlayout.c @@ -21,8 +21,9 @@ #include #include #include +#include -extern void graph_init(Agraph_t *g, boolean use_rankdir); +extern void graph_init(Agraph_t *g, bool use_rankdir); extern void graph_cleanup(Agraph_t *g); extern void gv_fixLocale (int set); extern void gv_initShapes (void); @@ -75,7 +76,7 @@ int gvLayoutJobs(GVC_t * gvc, Agraph_t * g) return -1; gv_fixLocale (1); - graph_init(g, gvc->layout.features->flags & LAYOUT_USES_RANKDIR); + graph_init(g, !!(gvc->layout.features->flags & LAYOUT_USES_RANKDIR)); GD_drawing(agroot(g)) = GD_drawing(g); gv_initShapes (); if (gvle && gvle->layout) {