Changeset 3391

Timestamp:

Mar 7, 2005, 6:19:29 PM (21 years ago)

Author:

eugene

Message:

added new versions of ALLOCATE (see libohana)

File:

• trunk/Ohana/src/libfits/include/fits.h (modified) (3 diffs)

trunk/Ohana/src/libfits/include/fits.h

@@ -22 +22 @@
 # endif /* NEWLINE */
 
+# ifndef MAX
+# define MIN(X,Y) ((X) < (Y) ? (X) : (Y))
+# define MAX(X,Y) ((X) > (Y) ? (X) : (Y))
+# endif
+
 /* general macros which should exist anyway! */
 # ifndef ALLOCATE
+# define ALLOCATE(X,T,S)  \
+  X = (T *) malloc ((unsigned)(MAX(((S)*((int)sizeof(T))),1))); \
+  if (X == NULL) { \
+    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)*((int)sizeof(T))),1))); \
+  if (X == NULL) { \
+    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)*((int)sizeof(T))),1))); \
+    if (X == NULL) { \
+      fprintf(stderr,"failed realloc increment at %s in %s\n", __LINE__, __FILE__);\
+      exit (10); } }
+# endif /* ALLOCATE */
+
+
+# if (0)
 # define ALLOCATE(X,T,S)  \
   X=(T *)malloc((unsigned) ((S)*sizeof(T)));\
@@ -38 +64 @@
        exit(0); \
     }
-# endif /* ALLOCATE */
+# endif /* old versions */
 
 # ifndef TRUE
@@ -49 +75 @@
 # endif
 
-# define MIN(X,Y) ((X) < (Y) ? (X) : (Y))
-# define MAX(X,Y) ((X) > (Y) ? (X) : (Y))