remove some unnecessary casts

These pointers coerce implicitly.

diff --git a/lib/cgraph/attr.c b/lib/cgraph/attr.c
index 8436b87cc773e91186f73054e852d2dccf583af9..38a1a9e148067d81b187f343c751de9ec422af23 100644 (file)
--- a/lib/cgraph/attr.c
+++ b/lib/cgraph/attr.c
@@ -155,7 +155,7 @@ Agsym_t *agattrsym(void *obj, char *name)
     Agsym_t *rv;
     char *arg = name;
 
-    data = agattrrec((Agobj_t *) obj);
+    data = agattrrec(obj);
     if (data)
        rv = agdictsym(data->dict, arg);
     else
@@ -219,7 +219,7 @@ static void freesym(Dict_t * d, void * obj, Dtdisc_t * disc)
     Agsym_t *sym;
 
     NOTUSED(d);
-    sym = (Agsym_t *) obj;
+    sym = obj;
     NOTUSED(disc);
     agstrfree(Ag_G_global, sym->name);
     agstrfree(Ag_G_global, sym->defval);
@@ -432,7 +432,7 @@ char *agget(void *obj, char *name)
     if (sym == NULL)
        rv = 0;                 /* note was "", but this provides more info */
     else {
-       data = agattrrec((Agobj_t *) obj);
+       data = agattrrec(obj);
        rv = (char *) (data->str[sym->id]);
     }
     return rv;
@@ -443,7 +443,7 @@ char *agxget(void *obj, Agsym_t * sym)
     Agattr_t *data;
     char *rv;
 
-    data = agattrrec((Agobj_t *) obj);
+    data = agattrrec(obj);
     assert((sym->id >= 0) && (sym->id < topdictsize(obj)));
     rv = (char *) (data->str[sym->id]);
     return rv;
@@ -470,7 +470,7 @@ int agxset(void *obj, Agsym_t * sym, char *value)
     Agsym_t *lsym;
 
     g = agraphof(obj);
-    hdr = (Agobj_t *) obj;
+    hdr = obj;
     data = agattrrec(hdr);
     assert((sym->id >= 0) && (sym->id < topdictsize(obj)));
     agstrfree(g, data->str[sym->id]);

diff --git a/lib/cgraph/edge.c b/lib/cgraph/edge.c
index 5af2d678783e78a2d87f5957136539e637c630c9..d4579ee386dbef1fdebf39cfee05e463a15a242a 100644 (file)
--- a/lib/cgraph/edge.c
+++ b/lib/cgraph/edge.c
@@ -69,7 +69,7 @@ Agedge_t *agnxtin(Agraph_t * g, Agedge_t * e)
     sn = agsubrep(g, n);
        if (sn) {
                dtrestore(g->e_seq, sn->in_seq);
-               f = (Agedge_t *) dtnext(g->e_seq, e);
+               f = dtnext(g->e_seq, e);
                sn->in_seq = dtextract(g->e_seq);
        }
        return f;
@@ -202,7 +202,7 @@ static Agedge_t *newedge(Agraph_t * g, Agnode_t * t, Agnode_t * h,
 
     (void)agsubnode(g,t,TRUE);
     (void)agsubnode(g,h,TRUE);
-    e2 = (Agedgepair_t *) agalloc(g, sizeof(Agedgepair_t));
+    e2 = agalloc(g, sizeof(Agedgepair_t));
     in = &(e2->in);
     out = &(e2->out);
     seq = agnextseq(g, AGEDGE);

diff --git a/lib/cgraph/obj.c b/lib/cgraph/obj.c
index 74cb8e17be0b213f75dfa5cf703499fb24a40ae7..d565ec97179240abb3bf23c14fc7dd929e635970 100644 (file)
--- a/lib/cgraph/obj.c
+++ b/lib/cgraph/obj.c
@@ -13,12 +13,12 @@
 
 int agdelete(Agraph_t * g, void *obj)
 {
-    if ((AGTYPE((Agobj_t *) obj) == AGRAPH) && (g != agparent(obj))) {
+    if ((AGTYPE(obj) == AGRAPH) && (g != agparent(obj))) {
        agerr(AGERR, "agdelete on wrong graph");
        return FAILURE;
     }
 
-    switch (AGTYPE((Agobj_t *) obj)) {
+    switch (AGTYPE(obj)) {
     case AGNODE:
        return agdelnode(g, obj);
     case AGINEDGE:
@@ -239,7 +239,7 @@ int agcontains(Agraph_t* g, void* obj)
     if (agroot (g) != agroot (obj)) return 0;
     switch (AGTYPE(obj)) {
     case AGRAPH:
-       subg = (Agraph_t *) obj;
+       subg = obj;
        do {
            if (subg == g) return 1;
        } while ((subg = agparent (subg)));
@@ -247,7 +247,7 @@ int agcontains(Agraph_t* g, void* obj)
     case AGNODE: 
         return (agidnode(g, AGID(obj), 0) != 0);
     default:
-        return (agsubedge(g, (Agedge_t *) obj, 0) != 0);
+        return (agsubedge(g, obj, 0) != 0);
     }
 }
 

diff --git a/lib/cgraph/pend.c b/lib/cgraph/pend.c
index 066c80b812764b03eb5bfef9de3c4e631e480e65..2faa705ef3c2930ba99307a35b4efd6dbc77ff1d 100644 (file)
--- a/lib/cgraph/pend.c
+++ b/lib/cgraph/pend.c
@@ -167,8 +167,7 @@ static pending_cb_t *insert(Dict_t * dict, Agraph_t * g, Agobj_t * obj,
     handle->key = genkey(obj);
     handle->g = g;
     if (optsym) {
-       handle->symlist =
-           (symlist_t *) agalloc(handle->g, sizeof(symlist_t));
+       handle->symlist = agalloc(handle->g, sizeof(symlist_t));
        handle->symlist->sym = optsym;
     }
     dtinsert(dict, handle);

diff --git a/lib/cgraph/refstr.c b/lib/cgraph/refstr.c
index 1517417085d530ce12cbf1a2db7955ae29490567..b524649fffc4c8b82907abfe325f8ad3185dc316 100644 (file)
--- a/lib/cgraph/refstr.c
+++ b/lib/cgraph/refstr.c
@@ -100,7 +100,7 @@ char *agstrdup(Agraph_t * g, char *s)
     else {
        sz = sizeof(refstr_t) + strlen(s);
        if (g)
-           r = (refstr_t *) agalloc(g, sz);
+           r = agalloc(g, sz);
        else
            r = malloc(sz);
        r->refcnt = 1;
@@ -127,7 +127,7 @@ char *agstrdup_html(Agraph_t * g, char *s)
     else {
        sz = sizeof(refstr_t) + strlen(s);
        if (g)
-           r = (refstr_t *) agalloc(g, sz);
+           r = agalloc(g, sz);
        else
            r = malloc(sz);
        r->refcnt = 1;

diff --git a/lib/mingle/agglomerative_bundling.c b/lib/mingle/agglomerative_bundling.c
index 1ab241438b08aa028467c3a48c3d547948fa799a..00e6e3d5283cbdde306f495a2736bc2521b47571 100644 (file)
--- a/lib/mingle/agglomerative_bundling.c
+++ b/lib/mingle/agglomerative_bundling.c
@@ -191,10 +191,10 @@ static Agglomerative_Ink_Bundling Agglomerative_Ink_Bundling_establish(Agglomera
        if (ip){
          for (k = ip[jmax]; k < ip[jmax+1]; k++) {
            ie = jp[k];
-           Vector_add(cedges[nc], (void*) (&ie));
+           Vector_add(cedges[nc], &ie);
          }
        } else {
-         Vector_add(cedges[nc], (void*) (&jmax));
+         Vector_add(cedges[nc], &jmax);
        }
        jc = nc;
        nc++;
@@ -217,10 +217,10 @@ static Agglomerative_Ink_Bundling Agglomerative_Ink_Bundling_establish(Agglomera
     if (ip){
       for (k = ip[i]; k < ip[i+1]; k++) {
        ie = jp[k];
-       Vector_add(cedges[jc], (void*) (&ie));
+       Vector_add(cedges[jc], &ie);
       }
     } else {
-       Vector_add(cedges[jc], (void*) (&i));
+       Vector_add(cedges[jc], &i);
     }
     cinks[jc] = minink;
     grand_total_ink += minink;

diff --git a/lib/pack/ccomps.c b/lib/pack/ccomps.c
index c70e0ead67ed685f763bf1155901ef44014317b5..88648998bf70c16091954c7c9ca75b467292fb29 100644 (file)
--- a/lib/pack/ccomps.c
+++ b/lib/pack/ccomps.c
@@ -175,7 +175,7 @@ setPrefix (char* pfx, size_t* lenp, char* buf, size_t buflen)
     if (len + 25 <= buflen)
         name = buf;
     else {
-        name = (char *) gmalloc(len + 25);
+        name = gmalloc(len + 25);
     }
     strcpy(name, pfx);
     *lenp = len;

diff --git a/lib/sparse/vector.c b/lib/sparse/vector.c
index ecb7345796e56140de3c1d21d8db700083ee9057..e4f639fd1bd3a62a31e4c08c53c5884376e5c974 100644 (file)
--- a/lib/sparse/vector.c
+++ b/lib/sparse/vector.c
@@ -82,7 +82,7 @@ Vector IntegerVector_new(int len){
 
 }
 Vector IntegerVector_add(Vector v, int i){
-  return Vector_add(v, (void*) &i);
+  return Vector_add(v, &i);
 }
 
 void IntegerVector_delete(Vector v){
@@ -90,10 +90,9 @@ void IntegerVector_delete(Vector v){
 }
 
 int* IntegerVector_get(Vector v, int i){
-  int *p;
-  p = (int*) Vector_get(v, i);
+  int *p = Vector_get(v, i);
   if (!p) return NULL;
-  return (int*) p;
+  return p;
 }
 
 int IntegerVector_get_length(Vector v){
@@ -101,7 +100,7 @@ int IntegerVector_get_length(Vector v){
 }
 
 Vector IntegerVector_reset(Vector v, int content, int pos){
-  return Vector_reset(v, (void*) (&content), pos);
+  return Vector_reset(v, &content, pos);
 }
 
 
@@ -110,8 +109,7 @@ Vector IntegerVector_reset(Vector v, int content, int pos){
 /*---------------- string vector --------------- */
 
 static void strdealloactor(void *v){
-  char **s;
-  s = (char**) v;
+  char **s = v;
   free(*s);
 }
 
@@ -125,7 +123,7 @@ Vector StringVector_new(int len, int delete_element_strings){
 
 }
 Vector StringVector_add(Vector v, char *s){
-  return Vector_add(v, (void*) &s);
+  return Vector_add(v, &s);
 }
 
 void StringVector_delete(Vector v){
@@ -133,8 +131,7 @@ void StringVector_delete(Vector v){
 }
 
 char** StringVector_get(Vector v, int i){
-  char **p;
-  p = (char**) Vector_get(v, i);
+  char **p = Vector_get(v, i);
   if (!p) return NULL;
   return p;
 }
@@ -144,7 +141,7 @@ int StringVector_get_length(Vector v){
 }
 
 Vector StringVector_reset(Vector v, char *content, int pos){
-  return Vector_reset(v, (void*) (&content), pos);
+  return Vector_reset(v, &content, pos);
 }
 
 void StringVector_fprint1(FILE *fp, StringVector v){