remove unnecessary cast of dtfirst() return value

These pointers implicitly coerce.

diff --git a/cmd/tools/gv2gxl.c b/cmd/tools/gv2gxl.c
index 5e528d7b13eb4d9310168ba19b2ef3c69d05c80b..75d4be1b28f9e55471bdaf8ae1cf34466dfd59bd 100644 (file)
--- a/cmd/tools/gv2gxl.c
+++ b/cmd/tools/gv2gxl.c
@@ -412,7 +412,7 @@ writeDict(Agraph_t * g, FILE * gxlFile, char *name, Dict_t * dict,
     Agsym_t *sym, *psym;
 
     view = dtview(dict, NULL);
-    for (sym = (Agsym_t *) dtfirst(dict); sym;
+    for (sym = dtfirst(dict); sym;
         sym = (Agsym_t *) dtnext(dict, sym)) {
        if (!isGxlGrammar(sym->name)) {
            if (EMPTY(sym->defval)) {   /* try to skip empty str (default) */
@@ -619,7 +619,7 @@ writeNondefaultAttr(void *obj, FILE * gxlFile, Dict_t * defdict)
     }
     data = (Agattr_t *) agattrrec(obj);
     if (data) {
-       for (sym = (Agsym_t *) dtfirst(defdict); sym;
+       for (sym = dtfirst(defdict); sym;
             sym = (Agsym_t *) dtnext(defdict, sym)) {
            if (!isGxlGrammar(sym->name)) {
                if ((AGTYPE(obj) == AGINEDGE)

diff --git a/lib/cgraph/attr.c b/lib/cgraph/attr.c
index 601124807cbd9935c1695a3798fb4e35cb4f2974..181e230bac7ae822760851eebcc073de23adf08c 100644 (file)
--- a/lib/cgraph/attr.c
+++ b/lib/cgraph/attr.c
@@ -94,7 +94,7 @@ static void agcopydict(Dict_t * src, Dict_t * dest, Agraph_t * g, int kind)
     Agsym_t *sym, *newsym;
 
     assert(dtsize(dest) == 0);
-    for (sym = (Agsym_t *) dtfirst(src); sym;
+    for (sym = dtfirst(src); sym;
         sym = (Agsym_t *) dtnext(src, sym)) {
        newsym = agnewsym(g, sym->name, sym->defval, sym->id, kind);
        newsym->print = sym->print;
@@ -197,7 +197,7 @@ static Agrec_t *agmakeattrs(Agraph_t * context, void *obj)
            sz = MINATTR;
        rec->str = agalloc(agraphof(obj), (size_t) sz * sizeof(char *));
        /* doesn't call agxset() so no obj-modified callbacks occur */
-       for (sym = (Agsym_t *) dtfirst(datadict); sym;
+       for (sym = dtfirst(datadict); sym;
             sym = (Agsym_t *) dtnext(datadict, sym))
            rec->str[sym->id] = agstrdup(agraphof(obj), sym->defval);
     } else {
@@ -350,7 +350,7 @@ Agsym_t *agnxtattr(Agraph_t * g, int kind, Agsym_t * attr)
        if (attr)
            rv = (Agsym_t *) dtnext(d, attr);
        else
-           rv = (Agsym_t *) dtfirst(d);
+           rv = dtfirst(d);
     } else
        rv = 0;
     return rv;

diff --git a/lib/cgraph/edge.c b/lib/cgraph/edge.c
index aa73c553a53327c7a69aef9ea8937fa7637571db..eb23be3d981fc3fe5ffd0d1d8d4712d40c048908 100644 (file)
--- a/lib/cgraph/edge.c
+++ b/lib/cgraph/edge.c
@@ -30,7 +30,7 @@ Agedge_t *agfstout(Agraph_t * g, Agnode_t * n)
     sn = agsubrep(g, n);
     if (sn) {
                dtrestore(g->e_seq, sn->out_seq);
-               e = (Agedge_t *) dtfirst(g->e_seq);
+               e = dtfirst(g->e_seq);
                sn->out_seq = dtextract(g->e_seq);
        }
     return e;
@@ -61,7 +61,7 @@ Agedge_t *agfstin(Agraph_t * g, Agnode_t * n)
     sn = agsubrep(g, n);
        if (sn) {
                dtrestore(g->e_seq, sn->in_seq);
-               e = (Agedge_t *) dtfirst(g->e_seq);
+               e = dtfirst(g->e_seq);
                sn->in_seq = dtextract(g->e_seq);
        }
     return e;

diff --git a/lib/cgraph/node.c b/lib/cgraph/node.c
index eb76ee7d2584b00ad8351756a26642e2ad9609bd..ca92749b8835d6900e98fc901d18505ca8aa2fe3 100644 (file)
--- a/lib/cgraph/node.c
+++ b/lib/cgraph/node.c
@@ -38,7 +38,7 @@ static Agnode_t *agfindnode_by_name(Agraph_t * g, char *name)
 Agnode_t *agfstnode(Agraph_t * g)
 {
     Agsubnode_t *sn;
-    sn = (Agsubnode_t *) dtfirst(g->n_seq);
+    sn = dtfirst(g->n_seq);
     return sn ? sn->node : NULL;
 }
 

diff --git a/lib/cgraph/pend.c b/lib/cgraph/pend.c
index 1f4cc2fae76ab00b4129931614e105902a6e0fff..b9c0ad67b10c9dd6be2257d3315d9b74ff3c3b73 100644 (file)
--- a/lib/cgraph/pend.c
+++ b/lib/cgraph/pend.c
@@ -241,7 +241,7 @@ static void cb(Dict_t * dict, int callback_kind)
     Agcbstack_t *stack;
 
     if (dict)
-       while ((pcb = (pending_cb_t *) dtfirst(dict))) {
+       while ((pcb = dtfirst(dict))) {
            g = pcb->g;
            stack = g->clos->cb;
            switch (callback_kind) {

diff --git a/lib/cgraph/subg.c b/lib/cgraph/subg.c
index 5a2218596933c4e91ecc3b638755c96573249264..e09c8fc04aa05717209e1893ee6c999fa0b66c1e 100644 (file)
--- a/lib/cgraph/subg.c
+++ b/lib/cgraph/subg.c
@@ -71,7 +71,7 @@ Agraph_t *agsubg(Agraph_t * g, char *name, int cflag)
 
 Agraph_t *agfstsubg(Agraph_t * g)
 {
-    return (Agraph_t *) dtfirst(g->g_dict);
+    return dtfirst(g->g_dict);
 }
 
 Agraph_t *agnxtsubg(Agraph_t * subg)

diff --git a/lib/cgraph/write.c b/lib/cgraph/write.c
index b6a2ffc9853ed2729510db5f5b67554de3d62ae3..32ed0ffdb283d47f71b7ac3f10b41c50892bc77b 100644 (file)
--- a/lib/cgraph/write.c
+++ b/lib/cgraph/write.c
@@ -242,7 +242,7 @@ static int write_dict(Agraph_t * g, iochan_t * ofile, char *name,
        view = dtview(dict, NULL);
     else
        view = 0;
-    for (sym = (Agsym_t *) dtfirst(dict); sym;
+    for (sym = dtfirst(dict); sym;
         sym = (Agsym_t *) dtnext(dict, sym)) {
        if (EMPTY(sym->defval) && !sym->print) {        /* try to skip empty str (default) */
            if (view == NULL)
@@ -408,7 +408,7 @@ static int not_default_attrs(Agraph_t * g, Agnode_t * n)
 
     NOTUSED(g);
     if ((data = agattrrec(n))) {
-       for (sym = (Agsym_t *) dtfirst(data->dict); sym;
+       for (sym = dtfirst(data->dict); sym;
             sym = (Agsym_t *) dtnext(data->dict, sym)) {
            if (data->str[sym->id] != sym->defval)
                return TRUE;
@@ -474,7 +474,7 @@ static int write_nondefault_attrs(void *obj, iochan_t * ofile,
     data = agattrrec(obj);
     g = agraphof(obj);
     if (data)
-       for (sym = (Agsym_t *) dtfirst(defdict); sym;
+       for (sym = dtfirst(defdict); sym;
             sym = (Agsym_t *) dtnext(defdict, sym)) {
            if ((AGTYPE(obj) == AGINEDGE) || (AGTYPE(obj) == AGOUTEDGE)) {
                if (Tailport && (sym->id == Tailport->id))

diff --git a/lib/circogen/blockpath.c b/lib/circogen/blockpath.c
index 138da797c9270b72f8e86de916bab326411d7b70..24f93523b36e7924906950d5331b17718f5800d2 100644 (file)
--- a/lib/circogen/blockpath.c
+++ b/lib/circogen/blockpath.c
@@ -423,7 +423,7 @@ static int count_all_crossings(nodelist_t * list, Agraph_t * subg)
                edgelistitem *eitem;
                Agedge_t *ep;
 
-               for (eitem = (edgelistitem *) dtfirst(openEdgeList); eitem;
+               for (eitem = dtfirst(openEdgeList); eitem;
                     eitem =
                     (edgelistitem *) dtnext(openEdgeList, eitem)) {
                    ep = eitem->edge;

diff --git a/lib/circogen/deglist.c b/lib/circogen/deglist.c
index a7a8433406f54032aed51f7b19df77e8a4b2cba0..7b1878fede6e5678d7d0127b47ce93bb1bdc4060 100644 (file)
--- a/lib/circogen/deglist.c
+++ b/lib/circogen/deglist.c
@@ -130,7 +130,7 @@ Agnode_t *firstDeglist(deglist_t * list)
     degitem *ip;
     Agnode_t *np;
 
-    ip = (degitem *) dtfirst(list);
+    ip = dtfirst(list);
     if (ip) {
        np = ip->np;
        ip->np = ND_next(np);
@@ -147,7 +147,7 @@ void printDeglist(deglist_t * dl)
     degitem *ip;
     node_t *np;
     fprintf(stderr, " dl:\n");
-    for (ip = (degitem *) dtfirst(dl); ip; ip = (degitem *) dtnext(dl, ip)) {
+    for (ip = dtfirst(dl); ip; ip = (degitem *) dtnext(dl, ip)) {
        np = ip->np;
        if (np)
            fprintf(stderr, " (%d)", ip->deg);

diff --git a/lib/circogen/nodeset.c b/lib/circogen/nodeset.c
index 5b01678c6e0b49434997cce1512744e56af210a4..5aeef35b4bc1a9066f4d910f4575a5356b510bb3 100644 (file)
--- a/lib/circogen/nodeset.c
+++ b/lib/circogen/nodeset.c
@@ -111,7 +111,7 @@ int sizeNodeset(nodeset_t * ns)
 void printNodeset(nodeset_t * ns)
 {
     nsitem_t *ip;
-    for (ip = (nsitem_t *) dtfirst(ns); ip;
+    for (ip = dtfirst(ns); ip;
         ip = (nsitem_t *) dtnext(ns, ip)) {
        fprintf(stderr, "%s", agnameof(ip->np));
     }

diff --git a/lib/common/htmlparse.y b/lib/common/htmlparse.y
index fcd752c158c46292dffafa6b2a07b0a2c668bfab..6b24794fa9971e8a65ca36dda9152b0f172e9a0b 100644 (file)
--- a/lib/common/htmlparse.y
+++ b/lib/common/htmlparse.y
@@ -245,7 +245,7 @@ mkText(void)
     if (cnt) {
        int i = 0;
        hft->spans = N_NEW(cnt,htextspan_t);    
-       for(fl=(fspan *)dtfirst(ispan); fl; fl=(fspan *)dtnext(ispan,fl)) {
+       for(fl=dtfirst(ispan); fl; fl=(fspan *)dtnext(ispan,fl)) {
            hft->spans[i] = fl->lp;
            i++;
        }

diff --git a/lib/expr/excc.c b/lib/expr/excc.c
index 0a179dfc2b7d7c7c5c31fb301b2f4124c2fdfbc2..7ba7a8d3ce467f8055525e2ab1003c404e98094b 100644 (file)
--- a/lib/expr/excc.c
+++ b/lib/expr/excc.c
@@ -732,7 +732,7 @@ exdump(Expr_t* expr, Exnode_t* node, Sfio_t* sp)
        if (node)
                gen(cc, node);
        else
-               for (sym = (Exid_t*)dtfirst(expr->symbols); sym; sym = (Exid_t*)dtnext(expr->symbols, sym))
+               for (sym = dtfirst(expr->symbols); sym; sym = (Exid_t*)dtnext(expr->symbols, sym))
                        if (sym->lex == PROCEDURE && sym->value)
                        {
                                sfprintf(sp, "%s:\n", sym->name);

diff --git a/lib/expr/exeval.c b/lib/expr/exeval.c
index d713508f4ef29d30d505a5b9fe776600938543ef..fb782a8f3e39d446b871f642ace5763743cb9cba 100644 (file)
--- a/lib/expr/exeval.c
+++ b/lib/expr/exeval.c
@@ -1136,7 +1136,7 @@ eval(Expr_t* ex, Exnode_t* expr, void* env)
                if (expr->data.generate.array->op == DYNAMIC)
                {
                        n = expr->data.generate.index->type == STRING;
-                       for (assoc = (Exassoc_t*)dtfirst((Dt_t*)expr->data.generate.array->data.variable.symbol->local.pointer); assoc; assoc = (Exassoc_t*)dtnext((Dt_t*)expr->data.generate.array->data.variable.symbol->local.pointer, assoc))
+                       for (assoc = dtfirst((Dt_t*)expr->data.generate.array->data.variable.symbol->local.pointer); assoc; assoc = (Exassoc_t*)dtnext((Dt_t*)expr->data.generate.array->data.variable.symbol->local.pointer, assoc))
                        {
                                v.integer++;
                                if (n)

diff --git a/lib/expr/exgram.h b/lib/expr/exgram.h
index 37ea76b98b6fa081679350b7dc08d27a109ab4af..8e7f1d5cb145419503afbcf472cfaa3c0bcee3bf 100644 (file)
--- a/lib/expr/exgram.h
+++ b/lib/expr/exgram.h
@@ -1025,7 +1025,7 @@ excomp(Expr_t* p, const char* name, int line, const char* sp, Sfio_t* fp)
        p->eof = eof;
        if (expr.statics)
        {
-               for (v = (Exid_t*)dtfirst(p->symbols); v; v = (Exid_t*)dtnext(p->symbols, v))
+               for (v = dtfirst(p->symbols); v; v = (Exid_t*)dtnext(p->symbols, v))
                        if (v->isstatic)
                        {
                                dtdelete(p->symbols, v);

diff --git a/lib/ortho/ortho.c b/lib/ortho/ortho.c
index 6fdf98f0e4c01c8429b8337c81951623fff0444d..a3abb2edef79b9fa475884ea53c5e9d58034acf0 100644 (file)
--- a/lib/ortho/ortho.c
+++ b/lib/ortho/ortho.c
@@ -542,7 +542,7 @@ dumpChanG (channel* cp, int v)
     if (dtsize(adj) == 0) continue;
     putSeg (stderr, cp->seg_list[k]);
     fputs (" ->\n", stderr);
-    for (ip = (intitem*)dtfirst(adj); ip; ip = (intitem*)dtnext(adj, ip)) {
+    for (ip = dtfirst(adj); ip; ip = (intitem*)dtnext(adj, ip)) {
       fputs ("     ", stderr);
       putSeg (stderr, cp->seg_list[ip->id]);
       fputs ("\n", stderr);