Remove 1 -Wbad-function-cast warning in agdtdelete

Changes the *internal* API by instead of casting the void pointer that
dtdelete returns to long, returns an int which is 0 if the pointer is
NULL and 1 otherwise. It doesn't really matter though, since the
return value is not used anywhere today.

diff --git a/lib/cgraph/cghdr.h b/lib/cgraph/cghdr.h
index 10c63614c37c1a6ccbbd88b5f00a4e2b44252120..db195d5db16aa74d8dd9394245c22aeb4215263d 100644 (file)
--- a/lib/cgraph/cghdr.h
+++ b/lib/cgraph/cghdr.h
@@ -106,7 +106,7 @@ uint64_t agnextseq(Agraph_t * g, int objtype);
 /* dict helper functions */
 Dict_t *agdtopen(Agraph_t * g, Dtdisc_t * disc, Dtmethod_t * method);
 void agdtdisc(Agraph_t * g, Dict_t * dict, Dtdisc_t * disc);
-long agdtdelete(Agraph_t * g, Dict_t * dict, void *obj);
+int agdtdelete(Agraph_t * g, Dict_t * dict, void *obj);
 int agdtclose(Agraph_t * g, Dict_t * dict);
 void *agdictobjmem(Dict_t * dict, void * p, size_t size,
                   Dtdisc_t * disc);

diff --git a/lib/cgraph/utils.c b/lib/cgraph/utils.c
index 24d76e296fbe82daf0017159e334a75fd11fd8e4..bdfa84efc3f486e50f053ebb21a3eeaf45fb3c7b 100644 (file)
--- a/lib/cgraph/utils.c
+++ b/lib/cgraph/utils.c
@@ -64,10 +64,10 @@ Dict_t *agdtopen(Agraph_t * g, Dtdisc_t * disc, Dtmethod_t * method)
     return d;
 }
 
-long agdtdelete(Agraph_t * g, Dict_t * dict, void *obj)
+int agdtdelete(Agraph_t * g, Dict_t * dict, void *obj)
 {
     Ag_dictop_G = g;
-    return (long) dtdelete(dict, obj);
+    return dtdelete(dict, obj) != NULL;
 }
 
 int agobjfinalize(void * obj)