Changeset 27435 for trunk/Ohana/src/libfits/matrix/F_write_M.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/matrix/F_write_M.c (modified) (4 diffs)

trunk/Ohana/src/libfits/matrix/F_write_M.c

@@ -11 +11 @@
   if (f == NULL) return (FALSE);
   
-  fseek (f, 0, SEEK_END);  /* write matrix to end of file! */
+  fseeko (f, 0LL, SEEK_END);  /* write matrix to end of file! */
 
   status = gfits_fwrite_matrix (f, matrix);
@@ -21 +21 @@
 int gfits_fwrite_matrix (FILE *f, Matrix *matrix) {
 
-  int status, nbytes, Nbytes;
+  int status;
+  off_t nbytes, Nbytes;
 
   status = TRUE;
@@ -27 +28 @@
   /* this is a bit dangerous: we are not realloc'ing the matrix.
      if the size is wrong, it probably should simply pad the fwrite statement.
-     better policy should be defined (ie, matrix.size always correct blocking?)
+     better policy should be defined (ie, matrix.datasize always correct blocking?)
   */
 
-  if (matrix[0].size % FT_RECORD_SIZE) 
-    nbytes = FT_RECORD_SIZE * ((int) (matrix[0].size / FT_RECORD_SIZE) + 1);
+  if (matrix[0].datasize % FT_RECORD_SIZE) 
+    nbytes = FT_RECORD_SIZE * ((off_t) (matrix[0].datasize / FT_RECORD_SIZE) + 1);
   else 
-    nbytes = FT_RECORD_SIZE * ((int) (matrix[0].size / FT_RECORD_SIZE));
+    nbytes = FT_RECORD_SIZE * ((off_t) (matrix[0].datasize / FT_RECORD_SIZE));
 
   /* this is a bit cumbersome: swap all words, write out file, then swap back... */
 # ifdef BYTE_SWAP  
   { 
-    int i;
+    off_t i;
     unsigned char *byte0, *byte1, *byte2, *byte3, *byte4, *byte5, *byte6, *byte7, tmp;
     int perpix;
@@ -96 +97 @@
 # ifdef BYTE_SWAP 
   {
-    int i;
+    off_t i;
     unsigned char *byte0, *byte1, *byte2, *byte3, *byte4, *byte5, *byte6, *byte7, tmp;
     int perpix;