From 8b49ca62223d7d09fea9936ccd9888fd811f0bd1 Mon Sep 17 00:00:00 2001 From: Matthew Fernandez Date: Mon, 9 Nov 2020 20:19:45 -0800 Subject: [PATCH] remove unnecessary casts of make_label() argument These pointers implicitly coerce to void*. --- lib/common/input.c | 2 +- lib/common/shapes.c | 2 +- lib/common/utils.c | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/common/input.c b/lib/common/input.c index 4c0536db9..3a966a6e8 100644 --- a/lib/common/input.c +++ b/lib/common/input.c @@ -934,7 +934,7 @@ void do_graph_label(graph_t * sg) GD_has_labels(sg->root) |= GRAPH_LABEL; - GD_label(sg) = make_label((void*)sg, str, (aghtmlstr(str) ? LT_HTML : LT_NONE), + GD_label(sg) = make_label(sg, str, (aghtmlstr(str) ? LT_HTML : LT_NONE), late_double(sg, agfindgraphattr(sg, "fontsize"), DEFAULT_FONTSIZE, MIN_FONTSIZE), late_nnstring(sg, agfindgraphattr(sg, "fontname"), diff --git a/lib/common/shapes.c b/lib/common/shapes.c index 6fc4b7e77..01619bb22 100644 --- a/lib/common/shapes.c +++ b/lib/common/shapes.c @@ -3311,7 +3311,7 @@ static field_t *parse_reclbl(node_t * n, int LR, int flag, char *text) tsp--; *tsp = '\000'; fp->lp = - make_label((void *) n, text, + make_label(n, text, (lbl->html ? LT_HTML : LT_NONE), lbl->fontsize, lbl->fontname, lbl->fontcolor); diff --git a/lib/common/utils.c b/lib/common/utils.c index 1936a837a..b5fa3b716 100644 --- a/lib/common/utils.c +++ b/lib/common/utils.c @@ -645,11 +645,11 @@ void common_init_node(node_t * n) fi.fontsize = late_double(n, N_fontsize, DEFAULT_FONTSIZE, MIN_FONTSIZE); fi.fontname = late_nnstring(n, N_fontname, DEFAULT_FONTNAME); fi.fontcolor = late_nnstring(n, N_fontcolor, DEFAULT_COLOR); - ND_label(n) = make_label((void*)n, str, + ND_label(n) = make_label(n, str, ((aghtmlstr(str) ? LT_HTML : LT_NONE) | ( (shapeOf(n) == SH_RECORD) ? LT_RECD : LT_NONE)), fi.fontsize, fi.fontname, fi.fontcolor); if (N_xlabel && (str = agxget(n, N_xlabel)) && (str[0])) { - ND_xlabel(n) = make_label((void*)n, str, (aghtmlstr(str) ? LT_HTML : LT_NONE), + ND_xlabel(n) = make_label(n, str, (aghtmlstr(str) ? LT_HTML : LT_NONE), fi.fontsize, fi.fontname, fi.fontcolor); GD_has_labels(agraphof(n)) |= NODE_XLABEL; } @@ -729,7 +729,7 @@ int common_init_edge(edge_t * e) if (E_label && (str = agxget(e, E_label)) && (str[0])) { r = 1; initFontEdgeAttr(e, &fi); - ED_label(e) = make_label((void*)e, str, (aghtmlstr(str) ? LT_HTML : LT_NONE), + ED_label(e) = make_label(e, str, (aghtmlstr(str) ? LT_HTML : LT_NONE), fi.fontsize, fi.fontname, fi.fontcolor); GD_has_labels(sg) |= EDGE_LABEL; ED_label_ontop(e) = @@ -739,7 +739,7 @@ int common_init_edge(edge_t * e) if (E_xlabel && (str = agxget(e, E_xlabel)) && (str[0])) { if (!fi.fontname) initFontEdgeAttr(e, &fi); - ED_xlabel(e) = make_label((void*)e, str, (aghtmlstr(str) ? LT_HTML : LT_NONE), + ED_xlabel(e) = make_label(e, str, (aghtmlstr(str) ? LT_HTML : LT_NONE), fi.fontsize, fi.fontname, fi.fontcolor); GD_has_labels(sg) |= EDGE_XLABEL; } @@ -748,14 +748,14 @@ int common_init_edge(edge_t * e) /* vladimir */ if (E_headlabel && (str = agxget(e, E_headlabel)) && (str[0])) { initFontLabelEdgeAttr(e, &fi, &lfi); - ED_head_label(e) = make_label((void*)e, str, (aghtmlstr(str) ? LT_HTML : LT_NONE), + ED_head_label(e) = make_label(e, str, (aghtmlstr(str) ? LT_HTML : LT_NONE), lfi.fontsize, lfi.fontname, lfi.fontcolor); GD_has_labels(sg) |= HEAD_LABEL; } if (E_taillabel && (str = agxget(e, E_taillabel)) && (str[0])) { if (!lfi.fontname) initFontLabelEdgeAttr(e, &fi, &lfi); - ED_tail_label(e) = make_label((void*)e, str, (aghtmlstr(str) ? LT_HTML : LT_NONE), + ED_tail_label(e) = make_label(e, str, (aghtmlstr(str) ? LT_HTML : LT_NONE), lfi.fontsize, lfi.fontname, lfi.fontcolor); GD_has_labels(sg) |= TAIL_LABEL; } -- 2.40.0