Changeset 16139 for trunk/Ohana/src/libfits/table/F_set_column.c

Timestamp:

Jan 18, 2008, 2:52:14 PM (19 years ago)

Author:

eugene

Message:

return NULL if output var requested and entry not found

File:

• trunk/Ohana/src/libfits/table/F_set_column.c (modified) (6 diffs)

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

@@ -1 +1 @@
 # include <ohana.h>
 # include <gfitsio.h>
-# define SWAP_BYTE \
-  tmp = Pout[0]; Pout[0] = Pout[1]; Pout[1] = tmp;
-# define SWAP_WORD \
+# define SWAP_BYTE { \
+  char tmp; \
+  tmp = Pout[0]; Pout[0] = Pout[1]; Pout[1] = tmp; }
+# define SWAP_WORD { \
+  char tmp; \
   tmp = Pout[0]; Pout[0] = Pout[3]; Pout[3] = tmp; \
-  tmp = Pout[1]; Pout[1] = Pout[2]; Pout[2] = tmp;
-# define SWAP_DBLE \
+  tmp = Pout[1]; Pout[1] = Pout[2]; Pout[2] = tmp; }
+# define SWAP_DBLE { \
+  char tmp; \
   tmp = Pout[0]; Pout[0] = Pout[7]; Pout[7] = tmp; \
   tmp = Pout[1]; Pout[1] = Pout[6]; Pout[6] = tmp; \
   tmp = Pout[2]; Pout[2] = Pout[5]; Pout[5] = tmp; \
-  tmp = Pout[3]; Pout[3] = Pout[4]; Pout[4] = tmp;
+  tmp = Pout[3]; Pout[3] = Pout[4]; Pout[4] = tmp; }
 
 /***********************/
@@ -17 +20 @@
   int i, N, Nfields, Nval, Nbytes, Nx, Ny, nbytes, Nstart, Nv, Nb;
   char tlabel[80], field[80], format[80], type[16], tmpline[16];
-  char *Pin, *Pout, *array, tmp;
+  char *Pin, *Pout, *array;
   double Bscale, Bzero;
-  int I;
 
   if (label == (char *) NULL) return (FALSE);
@@ -82 +84 @@
       *(short *)Pout = (*(short *)Pin - Bzero) / Bscale;
 # ifdef BYTE_SWAP
-      I = i*Nbytes;
       SWAP_BYTE;
 # endif
@@ -91 +92 @@
       *(int *)Pout = (*(int *)Pin - Bzero) / Bscale;
 # ifdef BYTE_SWAP
-      I = i*Nbytes;
       SWAP_WORD;
 # endif
@@ -100 +100 @@
       *(float *)Pout = (*(float *)Pin - Bzero) / Bscale;
 # ifdef BYTE_SWAP
-      I = i*Nbytes;
       SWAP_WORD;
 # endif
@@ -109 +108 @@
       *(double *)Pout = (*(double *)Pin - Bzero) / Bscale;
 # ifdef BYTE_SWAP
-      I = i*Nbytes;
       SWAP_DBLE;
 # endif