Changeset 27838 for branches/tap_branches/Ohana/src/libfits/table/F_read_T.c

Timestamp:

May 3, 2010, 8:41:49 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/tap_branches

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/libfits/table/F_read_T.c (modified) (19 diffs)

branches/tap_branches/Ohana/src/libfits/table/F_read_T.c

@@ -19 +19 @@
 int gfits_fread_ftable (FILE *f, FTable *table, char *extname) {
 
-  int j, found, Nbytes;
+  int j, found;
+  off_t Nbytes;
   Header *header;
   char tname[80];
 
   header = table[0].header;
-  fseek (f, 0, SEEK_SET);
+  fseeko (f, 0, SEEK_SET);
 
   found = FALSE;
@@ -42 +43 @@
     /* skip to next header */
     Nbytes = gfits_data_size (header);
-    fseek (f, Nbytes, SEEK_CUR);
+    fseeko (f, Nbytes, SEEK_CUR);
     gfits_free_header (header);
   }
@@ -51 +52 @@
 int gfits_fread_ftable_data (FILE *f, FTable *table) {
 
-  int Nbytes, Nread;
+  off_t Nbytes, Nread;
   char string[128];
 
@@ -63 +64 @@
     perror (string);
     if (Nread < gfits_data_min_size (table[0].header)) {
-      fprintf (stderr, "error: fits read error in %s, read %d, need %d\n", __func__, Nread, gfits_data_min_size (table[0].header));
+      fprintf (stderr, "error: fits read error in %s, read %lld, need %lld\n", __func__, (long long) Nread, (long long) gfits_data_min_size (table[0].header));
       gfits_free_table  (table);
       return (FALSE);
@@ -69 +70 @@
     fprintf (stderr, "warning: file missing pad\n");
   }
-  table[0].size = Nbytes;
+  table[0].datasize = Nbytes;
   return (TRUE);
 }       
 
 /*********************** fits read ftable data ***********************************/
-int gfits_fread_ftable_range (FILE *f, FTable *table, int start, int Nrows) {
-
-  int Nbytes, Nread, Nskip, Nx, Ny;
+int gfits_fread_ftable_range (FILE *f, FTable *table, off_t start, off_t Nrows) {
+
+  off_t Nbytes, Nread, Nskip, Nx, Ny;
 
   /* find disk table size */
@@ -93 +94 @@
   ALLOCATE (table[0].buffer, char, MAX (Nbytes, 1));
 
-  fseek (f, Nskip, SEEK_CUR);
+  fseeko (f, Nskip, SEEK_CUR);
 
   Nread = fread (table[0].buffer, sizeof (char), Nbytes, f);
@@ -108 +109 @@
   /* modify structure and header to match actual read rows Ny */
   table[0].header[0].Naxis[1] = Nrows;
-  gfits_modify (table[0].header, "NAXIS2",  "%d", 1, Nrows);
-  table[0].size = gfits_data_size (table[0].header);
+  gfits_modify (table[0].header, "NAXIS2",  "%lld", 1, (long long) Nrows);
+  table[0].datasize = gfits_data_size (table[0].header);
 
   return (TRUE);
@@ -115 +116 @@
 
 /*********************** fits read ftable data ***********************************/
-int gfits_fread_vtable_range (FILE *f, VTable *table, int start, int Nrows) {
-
-  int i, Nbytes, Nread, Nskip, Nx, Ny;
+int gfits_fread_vtable_range (FILE *f, VTable *table, off_t start, off_t Nrows) {
+
+  off_t i, Nbytes, Nread, Nskip, Nx, Ny;
   char *buffer;
 
@@ -123 +124 @@
   Nx = table[0].header[0].Naxis[0];
   Ny = table[0].header[0].Naxis[1];
-  table[0].size = gfits_data_size (table[0].header);
-  table[0].pad = table[0].size - Nx*Ny;
+  table[0].datasize = gfits_data_size (table[0].header);
+  table[0].pad = table[0].datasize - Nx*Ny;
 
   if (start < 0) return (FALSE);
@@ -133 +134 @@
   ALLOCATE (buffer, char, MAX (Nbytes, 1));
 
-  fseek (f, Nskip, SEEK_CUR);
+  fseeko (f, Nskip, SEEK_CUR);
   Nread = fread (buffer, sizeof (char), Nbytes, f);
   if (Nread != Nbytes) {
@@ -141 +142 @@
   }
 
-  ALLOCATE (table[0].row, int, MAX (Nrows, 1));
+  ALLOCATE (table[0].row, off_t, MAX (Nrows, 1));
   ALLOCATE (table[0].buffer, char *, MAX (Nrows, 1));
   for (i = 0; i < Nrows; i++) {
@@ -154 +155 @@
 
 /*********************** fits read virtual table ***********************************/
-int gfits_fread_vtable (FILE *f, VTable *table, char *extname, int Nrow, int *row) {
-
-  int i, j, Nbytes, Nread;
-  int start, Nx, Ny, offset;
+int gfits_fread_vtable (FILE *f, VTable *table, char *extname, off_t Nrow, off_t *row) {
+
+  off_t i, j;
+  off_t Nbytes, Nread;
+  off_t start, Nx, Ny, offset;
   Header *header;
   char tname[80];
 
   header = table[0].header;
-  fseek (f, 0, SEEK_SET);
+  fseeko (f, 0, SEEK_SET);
 
   for (j = -1; TRUE; j++) {
@@ -176 +178 @@
     if (strcmp (tname, extname)) {
       /* skip to next header */
-      fseek (f, Nbytes, SEEK_CUR);
+      fseeko (f, Nbytes, SEEK_CUR);
       gfits_free_header (header);
       continue;
@@ -182 +184 @@
 
     /* file pointer is at beginning of desired table data */
-    start = ftell (f);
-    gfits_scan (header, "NAXIS1", "%d", 1, &Nx);
-    gfits_scan (header, "NAXIS2", "%d", 1, &Ny);
+    start = ftello (f);
+    gfits_scan (header, "NAXIS1", "%lld", 1, (long long *) &Nx);
+    gfits_scan (header, "NAXIS2", "%lld", 1, (long long *) &Ny);
     for (i = 0; i < Nrow; i++) {
       if (row[i] > Ny) { return (FALSE); }
@@ -193 +195 @@
       ALLOCATE (table[0].buffer[i], char, MAX (1, Nx));
       offset = start + Nx*row[i];
-      fseek (f, offset, SEEK_SET);
+      fseeko (f, offset, SEEK_SET);
       Nread = fread (table[0].buffer[i], sizeof (char), Nx, f);
       if (Nread != Nx) { 
@@ -202 +204 @@
 
     table[0].Nrow  = Nrow;
-    ALLOCATE (table[0].row, int, MAX (1, Nrow));    
+    ALLOCATE (table[0].row, off_t, MAX (1, Nrow));    
     for (i = 0; i < Nrow; i++) table[0].row[i] = row[i];
-    table[0].size   = gfits_data_size (table[0].header);
-    table[0].pad    = table[0].size - Nx*Ny;
+    table[0].datasize = gfits_data_size (table[0].header);
+    table[0].pad      = table[0].datasize - Nx*Ny;
     return (TRUE);
   }
@@ -212 +214 @@
 int gfits_fread_header_extname (FILE *f, Header *header, char *extname) {
 
-  int Nbytes;
+  off_t Nbytes;
   char current[80];
 
-  fseek (f, 0, SEEK_SET);
+  fseeko (f, 0, SEEK_SET);
   gfits_fread_header (f, header);
 
@@ -221 +223 @@
 
   Nbytes = gfits_data_size (header);
-  fseek (f, Nbytes, SEEK_CUR);
+  fseeko (f, Nbytes, SEEK_CUR);
 
   while (gfits_fread_header (f, header)) {
@@ -227 +229 @@
     if (!strcmp (current, extname)) return (TRUE);
     Nbytes = gfits_data_size (header);
-    fseek (f, Nbytes, SEEK_CUR);
+    fseeko (f, Nbytes, SEEK_CUR);
   }
   return (FALSE);