also provide a calloc wrapper in lib/common

diff --git a/lib/common/memory.c b/lib/common/memory.c
index ab1006e4761aac823ea8d52ab2d8af3f53b31c8a..5610a450e441f929cbceb8609fab19c8f678b094 100644 (file)
--- a/lib/common/memory.c
+++ b/lib/common/memory.c
@@ -40,6 +40,16 @@ void *zrealloc(void *ptr, size_t size, size_t elt, size_t osize)
     return p;
 }
 
+void *gcalloc(size_t nmemb, size_t size)
+{
+    char *rv = calloc(nmemb, size);
+    if (rv == NULL) {
+       fprintf(stderr, "out of memory\n");
+       exit(EXIT_FAILURE);
+    }
+    return rv;
+}
+
 void *gmalloc(size_t nbytes)
 {
     char *rv;

diff --git a/lib/common/memory.h b/lib/common/memory.h
index 1f0c53c919d45a7a11341f743892f7d1391a3aa1..6d08dd8cf0aae70b9523bec74735688bdf4a413f 100644 (file)
--- a/lib/common/memory.h
+++ b/lib/common/memory.h
@@ -45,6 +45,7 @@ extern "C" {
 
     extern void *zmalloc(size_t);
     extern void *zrealloc(void *, size_t, size_t, size_t);
+    extern void *gcalloc(size_t nmemb, size_t size);
     extern void *gmalloc(size_t);
        extern void *grealloc(void *, size_t);
 #undef extern

diff --git a/lib/gvc.def b/lib/gvc.def
index 114d3a1335378002b0ce2dff9e8862c26fa3bf6b..d28d6d891e9978c60def331771bbe0503f1a848a 100644 (file)
--- a/lib/gvc.def
+++ b/lib/gvc.def
@@ -114,6 +114,7 @@ G_selectedfillcolor
 G_selectedpencolor    
 G_visitedfillcolor    
 G_visitedpencolor    
+gcalloc
 getdouble    
 getPack    
 getPackMode    

diff --git a/lib/gvc/gvc.def b/lib/gvc/gvc.def
index d3f658f22bd71df35bbaee66a1bb9106b62f5526..01579b7b0089471e1b87be77ef1b8beb1be6a683 100644 (file)
--- a/lib/gvc/gvc.def
+++ b/lib/gvc/gvc.def
@@ -114,6 +114,7 @@ G_selectedfillcolor
 G_selectedpencolor    
 G_visitedfillcolor    
 G_visitedpencolor    
+gcalloc
 getdouble    
 getPack    
 getPackMode