Changeset 3400 for trunk/Ohana/src/libfits

Timestamp:

Mar 9, 2005, 9:20:18 PM (21 years ago)

Author:

eugene

Message:

working to mosaic astrom

Location:

trunk/Ohana/src/libfits

Files:

• header/F_modify.c (modified) (1 diff)
• include/fits.h (modified) (2 diffs)
• table/F_get_column.c (modified) (1 diff)
• table/F_table_format.c (modified) (2 diffs)

trunk/Ohana/src/libfits/header/F_modify.c

@@ -102 +102 @@
 char *fits_keyword_start (char *line) {
 
-  int done;
   char *c;
 

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

@@ -32 +32 @@
   X = (T *) malloc ((unsigned)(MAX(((S)*((int)sizeof(T))),1))); \
   if (X == NULL) { \
-    fprintf(stderr,"failed malloc at %s in %s\n", __LINE__, __FILE__);\
+    fprintf(stderr,"failed malloc at %d 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__);\
+    fprintf(stderr,"failed realloc at %d in %s\n", __LINE__, __FILE__);\
     exit (10); }
 # define CHECK_REALLOCATE(X,T,S,N,D) \
@@ -44 +44 @@
     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__);\
+      fprintf(stderr,"failed realloc increment at %d in %s\n", __LINE__, __FILE__);\
       exit (10); } }
 # endif /* ALLOCATE */

trunk/Ohana/src/libfits/table/F_get_column.c

@@ -197 +197 @@
   if (label == (char *) NULL) return (FALSE);
   if (label[0] == 0) return (FALSE);
+  array = NULL;
 
   /* find label in header */

trunk/Ohana/src/libfits/table/F_table_format.c

@@ -54 +54 @@
 int fits_table_format (char *format, char *type, int *Nval, int *Nbytes) {
 
-  char Fchar, foo[80], bar;
+  char Fchar, Size[80], Type;
   int Nv;
 
@@ -64 +64 @@
   if (Nv == 0) { 
     Nv = 1;
-    strcpy (foo, "1");
+    strcpy (Size, "1");
   } else {
-    strcpy (foo, &format[1]);
+    strcpy (Size, &format[1]);
   }
-
-  if (Fchar == 'F') { *Nbytes = 1;  strcpy (type, "float");  bar = 'f'; *Nval = Nv; }
-  if (Fchar == 'I') { *Nbytes = 1;  strcpy (type, "int");    bar = 'd'; *Nval = Nv; }
-  if (Fchar == 'A') { *Nbytes = 1;  strcpy (type, "char");   bar = 's'; *Nval = Nv; }
+  
+  Type = 'x';
+  if (Fchar == 'F') { *Nbytes = 1;  strcpy (type, "float");  Type = 'f'; *Nval = Nv; }
+  if (Fchar == 'I') { *Nbytes = 1;  strcpy (type, "int");    Type = 'd'; *Nval = Nv; }
+  if (Fchar == 'A') { *Nbytes = 1;  strcpy (type, "char");   Type = 's'; *Nval = Nv; }
   if (!*Nbytes) { return (FALSE); }
   
-  sprintf (format, "%%-%s%c", foo, bar);
+  sprintf (format, "%%-%s%c", Size, Type);
 
   return (TRUE);