Changeset 2418

Timestamp:

Nov 23, 2004, 6:52:51 PM (22 years ago)

Author:

eugene

Message:

minor compilation errors

Location:

trunk/Ohana/src/libfits

Files:

• include/fitsio.h (modified) (1 diff)
• table/F_create_T.c (modified) (1 diff)
• table/F_read_T.c (modified) (6 diffs)

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

@@ -81 +81 @@
 int   fits_fread_ftable           PROTO((FILE *, FTable *, char *)); 
 int   fits_fread_vtable           PROTO((FILE *f, VTable *table, char *extname, int Nrow, int *row));
+int   fits_fread_ftable_data      PROTO((FILE *f, FTable *table));
 int   fits_fwrite_header          PROTO((FILE *, Header *)); 
 int   fits_fwrite_Theader         PROTO((FILE *, Header *));

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

@@ -28 +28 @@
 int fits_create_vtable (Header *header, VTable *table, int Nrow) {
 
-  int Nbytes;
+  int i, Nx, Ny;
   char type[80];
 

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

@@ -18 +18 @@
 int fits_fread_ftable (FILE *f, FTable *table, char *extname) {
 
-  int j, found, Nbytes, Nread;
+  int j, found, Nbytes;
   Header *header;
   char tname[80];
@@ -51 +51 @@
 
   int Nbytes, Nread;
-  char tname[80];
 
   /* find buffer size */
@@ -69 +68 @@
 int fits_fread_vtable_range (FILE *f, VTable *table, int start, int Nrows) {
 
-  int Nbytes, Nread, Nskip, Nx, Ny;
-  char tname[80], *buffer;
+  int i, Nbytes, Nread, Nskip, Nx, Ny;
+  char *buffer;
 
   /* find buffer size */
@@ -85 +84 @@
   ALLOCATE (buffer, char, MAX (Nbytes, 1));
 
-  Fseek (f, Nskip, SEEK_CUR);
+  fseek (f, Nskip, SEEK_CUR);
   Nread = fread (buffer, sizeof (char), Nbytes, f);
   if (Nread != Nbytes) {
@@ -215 +214 @@
 int fits_fread_header_extname (FILE *f, Header *header, char *extname) {
 
+  int Nbytes;
   char current[80];
 
@@ -225 +225 @@
   fseek (f, Nbytes, SEEK_CUR);
 
-  while (fits_fread_header (f, &header)) {
-    fits_scan (&header, "EXTNAME", "%s", 1, current);
+  while (fits_fread_header (f, header)) {
+    fits_scan (header, "EXTNAME", "%s", 1, current);
     if (!strcmp (current, extname)) return (TRUE);
-    Nbytes = fits_matrix_size (&header);
+    Nbytes = fits_matrix_size (header);
     fseek (f, Nbytes, SEEK_CUR);
   }