From: erg Date: Thu, 7 Dec 2006 22:49:37 +0000 (+0000) Subject: Re-do some .h files to limit exposure of internal values, .h files, X-Git-Tag: LAST_LIBGRAPH~32^2~5765 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bd6b16f43f1cfa089bbe69c51c49a1e38688dd7d;p=graphviz Re-do some .h files to limit exposure of internal values, .h files, and dependencies on config.h; return to a simple, concrete boolean type --- diff --git a/lib/pack/ccomps.c b/lib/pack/ccomps.c index 568cdfc04..d4b55be8e 100644 --- a/lib/pack/ccomps.c +++ b/lib/pack/ccomps.c @@ -70,7 +70,7 @@ static void insertFn(Agnode_t * n, void *state) * Note that the component subgraphs do not contain any edges. These must * be obtained from the root graph. */ -Agraph_t **pccomps(Agraph_t * g, int *ncc, char *pfx, bool * pinned) +Agraph_t **pccomps(Agraph_t * g, int *ncc, char *pfx, boolean * pinned) { int c_cnt = 0; char buffer[SMALLBUF]; @@ -80,7 +80,7 @@ Agraph_t **pccomps(Agraph_t * g, int *ncc, char *pfx, bool * pinned) Agraph_t **ccs; int len; int bnd = 10; - bool pin = FALSE; + boolean pin = FALSE; if (agnnodes(g) == 0) { *ncc = 0; diff --git a/lib/pack/pack.c b/lib/pack/pack.c index 049893b80..883a8ca86 100644 --- a/lib/pack/pack.c +++ b/lib/pack/pack.c @@ -579,7 +579,7 @@ point *putGraphs(int ng, Agraph_t ** gs, Agraph_t * root, point *places; Dict_t *ps; int i; - bool *fixed = pinfo->fixed; + boolean *fixed = pinfo->fixed; int fixed_cnt = 0; box fixed_bb = { {0, 0}, {0, 0} }; point center; @@ -847,7 +847,7 @@ packSubgraphs(int ng, Agraph_t ** gs, Agraph_t * root, pack_info * info) * Pack subgraphs followed by postprocessing. */ int -pack_graph(int ng, Agraph_t** gs, Agraph_t* root, bool* fixed) +pack_graph(int ng, Agraph_t** gs, Agraph_t* root, boolean* fixed) { int ret; pack_info info; diff --git a/lib/pack/pack.h b/lib/pack/pack.h index e77330ad7..a32017dd3 100644 --- a/lib/pack/pack.h +++ b/lib/pack/pack.h @@ -45,19 +45,19 @@ extern "C" { unsigned int margin; /* margin left around objects, in points */ int doSplines; /* use splines in constructing graph shape */ pack_mode mode; /* granularity and method */ - bool *fixed; /* fixed[i] == true implies g[i] should not be moved */ + boolean *fixed; /* fixed[i] == true implies g[i] should not be moved */ } pack_info; extern point *putGraphs(int, Agraph_t **, Agraph_t *, pack_info *); extern int packGraphs(int, Agraph_t **, Agraph_t *, pack_info *); extern int packSubgraphs(int, Agraph_t **, Agraph_t *, pack_info *); - extern int pack_graph(int, Agraph_t **, Agraph_t *, bool*); + extern int pack_graph(int, Agraph_t **, Agraph_t *, boolean*); extern pack_mode getPackMode(Agraph_t * g, pack_mode dflt); extern int getPack(Agraph_t *, int not_def, int dflt); extern int isConnected(Agraph_t *); extern Agraph_t **ccomps(Agraph_t *, int *, char *); - extern Agraph_t **pccomps(Agraph_t *, int *, char *, bool *); + extern Agraph_t **pccomps(Agraph_t *, int *, char *, boolean *); extern int nodeInduce(Agraph_t *); #ifdef __cplusplus