Changeset 3892 in MondoRescue for branches/3.3/mondo/src/common/libmondo-archive.c

Timestamp:

Mar 12, 2024, 3:10:24 AM (3 months ago)

Author:

Bruno Cornec

Message:

More compiler fixes

• Fix unused vars
• Fix FreeBSD #if alone
• Use MDSTAT_FILE everywhere
• Fix missing break
• Fix some strncpy. mr_strncpy used when safe
• Fix wrong g_isoform_header_str proto !
• find-cd & find-dvd => find-optical

File:

• branches/3.3/mondo/src/common/libmondo-archive.c (modified) (4 diffs)

branches/3.3/mondo/src/common/libmondo-archive.c

@@ -1446 +1446 @@
  * @param ntfsprog_fifo The FIFO to ntfsclone if this is an imagedev, NULL otherwise.
  * @param biggie_file_number The sequence number of this biggie file (starting from 0).
- * @param noof_biggie_files The number of biggie files there are total.
  * @return The number of errors encountered (0 for success)
  * @see make_slices_and_images
  * @ingroup LLarchiveGroup
  */
-int slice_up_file_etc(char *biggie_filename, char *ntfsprog_fifo, long biggie_file_number, long noof_biggie_files, bool use_ntfsprog) {
+int slice_up_file_etc(char *biggie_filename, char *ntfsprog_fifo, long biggie_file_number, bool use_ntfsprog) {
 
     /*@ buffers ************************************************** */
@@ -1812 +1811 @@
                 write_header_block_to_stream(biggie_fsize, bigfile_fname, use_ntfsprog ?  BLK_START_A_PIHBIGGIE : BLK_START_A_NORMBIGGIE);
             }
-            res = slice_up_file_etc(bigfile_fname, ntfsprog_fifo, biggie_file_number, noof_biggie_files, use_ntfsprog);
+            res = slice_up_file_etc(bigfile_fname, ntfsprog_fifo, biggie_file_number, use_ntfsprog);
 
             /* Free it here as ntfsprog_fifo is not used anymore */
@@ -2417 +2416 @@
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
         write_header_block_to_stream((off_t)0, "start-of-afioballs", BLK_START_AFIOBALLS);
+#ifdef __FreeBSD__
 #if __FreeBSD__ == 5
         log_msg(1, "Using single-threaded make_afioballs_and_images() to suit b0rken FreeBSD 5.0");
         res = make_afioballs_and_images_OLD();
+#endif
 #else
         res = make_afioballs_and_images_OLD();
@@ -2643 +2644 @@
     mr_asprintf(broken_bios_sz, "yes"); /* assume so */
 
-    if (pkpinfo->auto_recovery) {
+    if (bkpinfo->auto_recovery) {
         mr_asprintf(cd_recovery_sz, "yes");
     } else {