Changeset 3388

Timestamp:

Mar 7, 2005, 6:11:50 PM (21 years ago)

Author:

eugene

Message:

fixed ALLOCATE / REALLOCATE out-of-memory messages

File:

• trunk/Ohana/src/libohana/include/ohana.h (modified) (1 diff)

trunk/Ohana/src/libohana/include/ohana.h

@@ -76 +76 @@
 # ifndef ALLOCATE
 # define ALLOCATE(X,T,S)  \
-  X = (T *) malloc ((unsigned) (MAX(((S)*sizeof(T)),1)));\
+  X = (T *) malloc ((unsigned)(MAX(((S)*((int)sizeof(T))),1))); \
   if (X == NULL) { \
-    fprintf(stderr,"failed malloc at __LINE__ in __FILE__\n");\
+    fprintf(stderr,"failed malloc at %s in %s\n", __LINE__, __FILE__);\
     exit (10); } 
 # define REALLOCATE(X,T,S) \
-  X = (T *) realloc(X,(unsigned) (MAX(((S)*sizeof(T)),1))); \
+  X = (T *) realloc(X,(unsigned)(MAX(((S)*((int)sizeof(T))),1))); \
   if (X == NULL) { \
-    fprintf(stderr,"failed realloc at __LINE__ in __FILE__\n"); \
+    fprintf(stderr,"failed realloc at %s in %s\n", __LINE__, __FILE__);\
     exit (10); }
 # define CHECK_REALLOCATE(X,T,S,N,D) \
   if ((N) >= (S)) { \
     S += D; \
-    X = (T *) realloc (X,(unsigned) (MAX(((S)*sizeof(T)),1))); \
+    X = (T *) realloc(X,(unsigned)(MAX(((S)*((int)sizeof(T))),1))); \
     if (X == NULL) { \
-      fprintf(stderr,"failed to realloc X __LINE__ in __FILE__\n"); \
+      fprintf(stderr,"failed realloc increment at %s in %s\n", __LINE__, __FILE__);\
       exit (10); } }
 # endif /* ALLOCATE */