remove unnecessary casts of calloc() return value

calloc returns a void* which, in C, implicitly coerces to every other pointer
type.

diff --git a/cmd/tools/ccomps.c b/cmd/tools/ccomps.c
index 76e6c3a029eb5abea349271b312f6684959b2362..9ff360b7fbd9110a322a9b88958b25355a549e83 100644 (file)
--- a/cmd/tools/ccomps.c
+++ b/cmd/tools/ccomps.c
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <cgraph/cgraph.h>
 
-#define N_NEW(n,t)       (t*)calloc((n),sizeof(t))
+#define N_NEW(n,t)       calloc((n),sizeof(t))
 #define NEW(t)           malloc(sizeof(t))
 
 typedef struct {

diff --git a/cmd/tools/gc.c b/cmd/tools/gc.c
index ce0c2de0d19ef0e5ec112f1b60bcd89f3dfe1362..30be271b9813d831f55f06a5fbbf82ed97c79d5b 100644 (file)
--- a/cmd/tools/gc.c
+++ b/cmd/tools/gc.c
@@ -25,7 +25,7 @@
 #include <string.h>
 
 #define NEW(t)           malloc(sizeof(t))
-#define N_NEW(n,t)       (t*)calloc((n),sizeof(t))
+#define N_NEW(n,t)       calloc((n),sizeof(t))
 
 #include <cgraph/cgraph.h>
 #include <cgraph/cghdr.h>

diff --git a/cmd/tools/gml2gv.c b/cmd/tools/gml2gv.c
index 34e0057ea802ba61bc4d666a19bf657501188ae2..b2146325b2d5a407fc189b8c88f810f1f16caa4e 100644 (file)
--- a/cmd/tools/gml2gv.c
+++ b/cmd/tools/gml2gv.c
@@ -22,7 +22,7 @@
 
 #include <getopt.h>
 
-#define N_NEW(n,t)       (t*)calloc((n),sizeof(t))
+#define N_NEW(n,t)       calloc((n),sizeof(t))
 
 static int Verbose;
 static char* gname = "";

diff --git a/cmd/tools/graph_generator.c b/cmd/tools/graph_generator.c
index a0f747b3ae1e40d7e3aaa7e061a0132df5cee700..faf11992d5f73e65b32545fb3dc46ca0033bdef0 100644 (file)
--- a/cmd/tools/graph_generator.c
+++ b/cmd/tools/graph_generator.c
@@ -290,8 +290,8 @@ constructSierpinski(int v1, int v2, int v3, int depth, vtx_data* graph)
 
 }
 
-#define NEW(t)           (t*)calloc((1),sizeof(t))
-#define N_NEW(n,t)       (t*)calloc((n),sizeof(t))
+#define NEW(t)           calloc((1),sizeof(t))
+#define N_NEW(n,t)       calloc((n),sizeof(t))
 
 void makeSierpinski(int depth, edgefn ef)
 {

diff --git a/cmd/tools/graphml2gv.c b/cmd/tools/graphml2gv.c
index 447b9e4d3c15893501f8eb1eea90bb09239033b1..da32439c130bf68d6aa884dea66dc0ea81b176f2 100644 (file)
--- a/cmd/tools/graphml2gv.c
+++ b/cmd/tools/graphml2gv.c
@@ -56,14 +56,14 @@ struct slist {
 };
 
 #define NEW(t)      malloc(sizeof(t))
-#define N_NEW(n,t)  (t*)calloc((n),sizeof(t))
+#define N_NEW(n,t)  calloc((n),sizeof(t))
 /* Round x up to next multiple of y, which is a power of 2 */
 #define ROUND2(x,y) (((x) + ((y)-1)) & ~((y)-1))
 
 static void pushString(slist ** stk, const char *s)
 {
     int sz = ROUND2(sizeof(slist) + strlen(s), sizeof(void *));
-    slist *sp = (slist *) N_NEW(sz, char);
+    slist *sp = N_NEW(sz, char);
     strcpy(sp->buf, s);
     sp->next = *stk;
     *stk = sp;

diff --git a/cmd/tools/gv2gxl.c b/cmd/tools/gv2gxl.c
index 02bfbbba42bff9005f3b542e3f62be991e4325ec..1e0b600d3d5bb46a2f4bcdcffcd403a706f8e016 100644 (file)
--- a/cmd/tools/gv2gxl.c
+++ b/cmd/tools/gv2gxl.c
@@ -18,7 +18,7 @@
 #define SMALLBUF    128
 
 #define NEW(t)      malloc(sizeof(t))
-#define N_NEW(n,t)  (t*)calloc((n),sizeof(t))
+#define N_NEW(n,t)  calloc((n),sizeof(t))
 #define EMPTY(s)       ((s == 0) || (*s == '\0'))
 #define SLEN(s)     (sizeof(s)-1)
 

diff --git a/cmd/tools/gxl2gv.c b/cmd/tools/gxl2gv.c
index 0ed306766171c6249f210c2383907c303ad7a67b..c34adfc630f31a17af9fcab597c8d37320e06df0 100644 (file)
--- a/cmd/tools/gxl2gv.c
+++ b/cmd/tools/gxl2gv.c
@@ -49,14 +49,14 @@ struct slist {
 };
 
 #define NEW(t)      malloc(sizeof(t))
-#define N_NEW(n,t)  (t*)calloc((n),sizeof(t))
+#define N_NEW(n,t)  calloc((n),sizeof(t))
 /* Round x up to next multiple of y, which is a power of 2 */
 #define ROUND2(x,y) (((x) + ((y)-1)) & ~((y)-1))
 
 static void pushString(slist ** stk, const char *s)
 {
     int sz = ROUND2(sizeof(slist) + strlen(s), sizeof(void *));
-    slist *sp = (slist *) N_NEW(sz, char);
+    slist *sp = N_NEW(sz, char);
     strcpy(sp->buf, s);
     sp->next = *stk;
     *stk = sp;

diff --git a/cmd/tools/tred.c b/cmd/tools/tred.c
index 3da9ab577105cac525ca6b4a3a6ded860408f64d..fc4c2f08a6fdc6e91c3458e90e1bb9ffa0bdb4f3 100644 (file)
--- a/cmd/tools/tred.c
+++ b/cmd/tools/tred.c
@@ -28,7 +28,7 @@
 #include <stdlib.h>
 
 #define NEW(t)           malloc(sizeof(t))
-#define N_NEW(n,t)       (t*)calloc((n),sizeof(t))
+#define N_NEW(n,t)       calloc((n),sizeof(t))
 
 typedef struct {
     unsigned char on_stack;

diff --git a/lib/cgraph/agxbuf.c b/lib/cgraph/agxbuf.c
index 92a9927ca48a4ed59b59f1e0777bbc5802c458a6..f0155565f789e1b0e37e027a41e231f03ad1a59d 100644 (file)
--- a/lib/cgraph/agxbuf.c
+++ b/lib/cgraph/agxbuf.c
@@ -18,7 +18,7 @@
 #include <string.h>
 #include <cgraph/agxbuf.h>
 
-#define N_GNEW(n,t)     (t*)calloc((n),sizeof(t))
+#define N_GNEW(n,t)     calloc((n),sizeof(t))
 
 /* agxbinit:
  * Assume if init is non-null, hint = sizeof(init[])

diff --git a/lib/common/ellipse.c b/lib/common/ellipse.c
index 4362990ce1c26f0b6f204b3f884ff4dcb1d6b18e..be6c99f059b3e59f2304b7e436348a972c1eb1a0 100644 (file)
--- a/lib/common/ellipse.c
+++ b/lib/common/ellipse.c
@@ -58,8 +58,8 @@
 #define MAX(a,b)        ((a)>(b)?(a):(b))
 #define MIN(a,b)        ((a)<(b)?(a):(b))
 
-#define NEW(t) ((t*)calloc(1,sizeof(t)))
-#define N_NEW(n,t) ((t*)calloc(n,sizeof(t)))
+#define NEW(t) calloc(1,sizeof(t))
+#define N_NEW(n,t) calloc(n,sizeof(t))
 
 #define PI            3.14159265358979323846
 

diff --git a/lib/pathplan/visibility.c b/lib/pathplan/visibility.c
index 3a7ecdb91ffac47c2cf683462d6e4a6412a5d434..83afb919de836c627f731f193119253c9285fa29 100644 (file)
--- a/lib/pathplan/visibility.c
+++ b/lib/pathplan/visibility.c
@@ -35,7 +35,7 @@ static array2 allocArray(int V, int extra)
     COORD *p;
 
     arr = malloc((V + extra) * sizeof(COORD *));
-    p = (COORD *) calloc(V * V, sizeof(COORD));
+    p = calloc(V * V, sizeof(COORD));
     for (i = 0; i < V; i++) {
        arr[i] = p;
        p += V;

diff --git a/lib/xdot/xdot.c b/lib/xdot/xdot.c
index f5d65e0a07c89a1741b3e54ece943665c930f8c1..6b908eb3eb99e1c9aced41b336dece57b9155cf2 100644 (file)
--- a/lib/xdot/xdot.c
+++ b/lib/xdot/xdot.c
@@ -15,8 +15,8 @@
 #include <string.h>
 #include <ctype.h>
 
-#define NEW(t)           (t*)calloc(1, sizeof(t))
-#define N_NEW(n,t)       (t*)calloc((n), sizeof(t))
+#define NEW(t)           calloc(1, sizeof(t))
+#define N_NEW(n,t)       calloc((n), sizeof(t))
 
 typedef struct {
     unsigned char *buf;                /* start of buffer */
@@ -430,7 +430,7 @@ xdot *parseXDotFOn (char *s, drawfunc_t fns[], int sz, xdot* x)
 
     if (initcnt == 0) {
        bufsz = XDBSIZE;
-       ops = (char *) calloc(XDBSIZE, sz);
+       ops = calloc(XDBSIZE, sz);
     }
     else {
        ops = (char*)(x->ops);

diff --git a/plugin/core/gvrender_core_json.c b/plugin/core/gvrender_core_json.c
index 515aec7d22b3072817ed69e8d75b9e1139204618..104a65ee9b5b0dff4ed7a845197063b5c2e30717 100644 (file)
--- a/plugin/core/gvrender_core_json.c
+++ b/plugin/core/gvrender_core_json.c
@@ -614,7 +614,7 @@ static Dtdisc_t intDisc = {
     0
 };
 
-#define NEW(t)          (t*)calloc(1,sizeof(t))
+#define NEW(t)          calloc(1,sizeof(t))
 
 static int lookup (Dt_t* map, char* name)
 {

diff --git a/plugin/pango/gvgetfontlist_pango.c b/plugin/pango/gvgetfontlist_pango.c
index ec99cf21e5c174f34c6968fd20f23535263bc947..c6afc42aacec3ce9e572b2283b58b3e5bcb07d96 100644 (file)
--- a/plugin/pango/gvgetfontlist_pango.c
+++ b/plugin/pango/gvgetfontlist_pango.c
@@ -246,7 +246,7 @@ typedef struct {
 } availfont_t;
 
 #define NEW(t)          malloc(sizeof(t))
-#define N_NEW(n,t)      (t*)calloc((n),sizeof(t))
+#define N_NEW(n,t)      calloc((n),sizeof(t))
 
 static PostscriptAlias postscript_alias[] = {
 #include "ps_font_equiv.h"