remove unnecessary casts of make_label() argument

These pointers implicitly coerce to void*.

diff --git a/lib/common/input.c b/lib/common/input.c
index 4c0536db943a8a4adae66bb055d08d05bb1f1654..3a966a6e81ffff252b6aeaa3901e566044e50e34 100644 (file)
--- 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 6fc4b7e77534f5f4682a3c5c4c50a88a60d5d20a..01619bb22613e39057614005b0cb0d98daaeef95 100644 (file)
--- 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 1936a837a45e99202c5020950c499873ff4d79b1..b5fa3b7161dd07bdfb22d83a131ada1aa8aa431a 100644 (file)
--- 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;
     }