Changeset 27435 for trunk/Ohana/src/libfits/table/F_write_T.c

Timestamp:

Mar 24, 2010, 11:22:25 AM (16 years ago)

Author:

eugene

Message:

large update merging in changes for Ohana to support large files

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/libfits/table/F_write_T.c (modified) (7 diffs)

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

@@ -13 +13 @@
   if (f == (FILE *) NULL) return (FALSE);
   
-  status = fseek (f, 0, SEEK_END);  /* write table to end of file! */
+  status = fseeko (f, 0LL, SEEK_END);  /* write table to end of file! */
   status = gfits_fwrite_table (f, table);
 
@@ -23 +23 @@
 int gfits_fwrite_table (FILE *f, FTable *table) {
   
-  int Nbytes;
+  off_t Nbytes;
   
-  Nbytes = fwrite (table[0].buffer, sizeof(char), table[0].size, f);
+  Nbytes = fwrite (table[0].buffer, sizeof(char), table[0].datasize, f);
   
-  if (Nbytes != table[0].size) return (FALSE);
+  if (Nbytes != table[0].datasize) return (FALSE);
   return (TRUE);
 }       
@@ -34 +34 @@
 int gfits_fwrite_vtable (FILE *f, VTable *table) {
   
-  int i, Nx, Ny, Npad, offset, start;
-  int Nbytes, *row, Nrow;
+  off_t i, Nx, Ny, Npad, offset, start;
+  off_t Nbytes, *row, Nrow;
   char *pad;
 
   Nrow = table[0].Nrow;
   row = table[0].row;
-  gfits_scan (table[0].header, "NAXIS1", "%d", 1, &Nx);
-  gfits_scan (table[0].header, "NAXIS2", "%d", 1, &Ny);
+  gfits_scan (table[0].header, "NAXIS1", "%lld", 1, (long long *) &Nx);
+  gfits_scan (table[0].header, "NAXIS2", "%lld", 1, (long long *) &Ny);
 
   /* file pointer is at beginning of desired table data */
-  start = ftell (f);
+  start = ftello (f);
   
   for (i = 0; i < Nrow; i++) {
     offset = start + Nx*row[i];
-    fseek (f, offset, SEEK_SET);
+    fseeko (f, offset, SEEK_SET);
     Nbytes = fwrite (table[0].buffer[i], sizeof (char), Nx, f);
     if (Nbytes != Nx) { return (FALSE); }
   }
   
-  Npad = table[0].size - Nx*Ny;
+  Npad = table[0].datasize - Nx*Ny;
   ALLOCATE (pad, char, Npad);
   bzero (pad, Npad);
 
   offset = start + Nx*Ny;
-  fseek (f, offset, SEEK_SET);
+  fseeko (f, offset, SEEK_SET);
   Nbytes = fwrite (pad, sizeof (char), Npad, f);
   if (Nbytes != Npad) { return (FALSE); }
@@ -71 +71 @@
 
 /*********************** fits read ftable data ***********************************/
-int gfits_fwrite_ftable_range (FILE *f, FTable *ftable, int start, int Nrows, int Ndisk, int Ntotal) {
+int gfits_fwrite_ftable_range (FILE *f, FTable *ftable, off_t start, off_t Nrows, off_t Ndisk, off_t Ntotal) {
 
-  int Nbytes, Nwrite, Nskip, Nx, Npad;
+  off_t Nbytes, Nwrite, Nskip, Nx, Npad;
   char *pad;
 
@@ -79 +79 @@
   
   /* modify vtable to represent full disk table */
-  gfits_modify (ftable[0].header, "NAXIS2", "%d", 1, Ntotal);
+  gfits_modify (ftable[0].header, "NAXIS2", "%lld", 1, (long long) Ntotal);
   ftable[0].header[0].Naxis[1] = Ntotal;
 
   Nx = ftable[0].header[0].Naxis[0]; // final output table size on disk 
-  ftable[0].size = gfits_data_size (ftable[0].header);
+  ftable[0].datasize = gfits_data_size (ftable[0].header);
 
   Nskip = start * Nx;
@@ -95 +95 @@
 
   // cursor must be at start of the table (after table header)
-  fseek (f, Nskip, SEEK_CUR);
+  fseeko (f, Nskip, SEEK_CUR);
   Nwrite = fwrite (ftable[0].buffer, sizeof (char), Nbytes, f);
   if (Nwrite != Nbytes) {
@@ -102 +102 @@
 
   if (Ntotal >= Ndisk) {
-    Npad = ftable[0].size - Nx*Ntotal;
+    Npad = ftable[0].datasize - Nx*Ntotal;
     ALLOCATE (pad, char, Npad);
     bzero (pad, Npad);