Changeset 687 in MondoRescue for trunk/mondo/mondo/common/libmondo-stream.c

Timestamp:

Jul 17, 2006, 3:39:42 PM (18 years ago)

Author:

bcornec

Message:

merge -r671:686 $SVN_M/branches/stable

File:

• trunk/mondo/mondo/common/libmondo-stream.c (modified) (11 diffs)

trunk/mondo/mondo/common/libmondo-stream.c

@@ -156 +156 @@
     log_it("closeout_tape() -- entering");
     retval +=
-        write_header_block_to_stream(0, "end-of-backup",
+        write_header_block_to_stream((off_t)0, "end-of-backup",
                                      BLK_END_OF_BACKUP);
-    retval += write_header_block_to_stream(0, "end-of-tape", BLK_END_OF_TAPE);  /* just in case */
+    retval += write_header_block_to_stream((off_t)0, "end-of-tape", BLK_END_OF_TAPE);   /* just in case */
     /* write 1MB of crap */
     for (i = 0; i < 256 * 1024; i++) {
@@ -166 +166 @@
         (void) fwrite(blk, 1, 256 * 1024, g_tape_stream);
         if (should_we_write_to_next_tape
-            (bkpinfo->media_size[g_current_media_number], 256 * 1024)) {
+            (bkpinfo->media_size[g_current_media_number], (off_t)256 * 1024)) {
             start_to_write_to_next_tape(bkpinfo);
         }
@@ -386 +386 @@
                                  BLK_START_EXAT_FILE);
     write_file_to_stream_from_file(bkpinfo, xattr_fname);
-    write_header_block_to_stream(-1, xattr_fname, BLK_STOP_EXAT_FILE);
+    write_header_block_to_stream((off_t)-1, xattr_fname, BLK_STOP_EXAT_FILE);
 // acl
     write_header_block_to_stream(length_of_file(acl_fname), acl_fname,
                                  BLK_START_EXAT_FILE);
     write_file_to_stream_from_file(bkpinfo, acl_fname);
-    write_header_block_to_stream(-1, acl_fname, BLK_STOP_EXAT_FILE);
+    write_header_block_to_stream((off_t)-1, acl_fname, BLK_STOP_EXAT_FILE);
     write_header_block_to_stream(length_of_file(xattr_fname), xattr_fname,
                                  BLK_STOP_EXTENDED_ATTRIBUTES);
@@ -1062 +1062 @@
  * autodetecting the size. Huh?
  */
+
+/* BERLIOS: Should be reviewed for mediasize being a off_t ??? */
 bool
 should_we_write_to_next_tape(long mediasize,
-                             long long length_of_incoming_file)
+                             off_t length_of_incoming_file)
 {
     /*@ bool's ***************************************************** */
@@ -1303 +1305 @@
     g_tape_posK = 0;
     g_sigpipe = FALSE;
-    res += write_header_block_to_stream(0, "start-of-tape", BLK_START_OF_TAPE); /* just in case */
-    res += write_header_block_to_stream(0, "start-of-backup", BLK_START_OF_BACKUP); /* just in case */
+    res += write_header_block_to_stream((off_t)0, "start-of-tape", BLK_START_OF_TAPE);  /* just in case */
+    res += write_header_block_to_stream((off_t)0, "start-of-backup", BLK_START_OF_BACKUP);  /* just in case */
     return (res);
 }
@@ -1343 +1345 @@
             }
             if (i != last) {
-                write_header_block_to_stream(0,
+                write_header_block_to_stream((off_t)0,
                                              "stop-backcatalog-afio-or-slice",
                                              BLK_STOP_AN_AFIO_OR_SLICE);
@@ -1446 +1448 @@
     long i;
 
-    /*@ long long ************************************************** */
-    long long filesize;
+    off_t filesize;
 
 #ifdef EXTRA_TAPE_CHECKSUMS
@@ -1521 +1522 @@
     paranoid_fclose(fin);
     asprintf(&checksum, "%04x%04x", crc16, crctt);
-    write_header_block_to_stream(g_current_media_number, checksum,
+    /* BERLIOS: what does it do ??? */
+    write_header_block_to_stream((off_t)g_current_media_number, checksum,
                                  BLK_STOP_FILE);
     paranoid_free(checksum);
@@ -1541 +1543 @@
  */
 int
-write_header_block_to_stream(long long length_of_incoming_file,
+write_header_block_to_stream(off_t length_of_incoming_file,
                              char *filename, int control_char)
 {
@@ -1552 +1554 @@
     int i;
 
-    /*@ long long ************************************************** */
-    long long olen;
+    off_t olen;
 
     /*@ end vars *************************************************** */
@@ -1575 +1576 @@
     sprintf(tempblock + 6000 + control_char, "Mondolicious, baby");
     tempblock[7000] = control_char;
-    memcpy(tempblock + 7001, (char *) &olen, sizeof(long long));
+    memcpy(tempblock + 7001, (char *) &olen, sizeof(off_t));
     strcpy(tempblock + 1000, filename);
     g_tape_posK +=