Changeset 3892 in MondoRescue for branches/3.3/mondo/src/mondorestore/mondo-rstr-tools.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/mondorestore/mondo-rstr-tools.c (modified) (6 diffs)

branches/3.3/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -22 +22 @@
 // no include for now in mondo-rstr-newt.c
 extern int edit_filelist(struct s_node *);
+
+extern struct s_bkpinfo *bkpinfo;
 
 /**
@@ -90 +92 @@
 extern char *MONDO_LOGFILE;
 
-/* Reference to global bkpinfo */
-extern struct s_bkpinfo *bkpinfo;
-
 /* Should we use or not extended attributes and acl when restoring */
 extern char *g_getfattr;
@@ -525 +524 @@
  * @return TRUE if OK was pressed, FALSE otherwise.
  */
-bool get_isodir_info(char *isodir_device, char *isodir_format,
-                struct s_bkpinfo *bkpinfo, bool nuke_me_please)
+bool get_isodir_info(char *isodir_device, char *isodir_format, bool nuke_me_please)
 {
 
@@ -610 +608 @@
 }
 
-if (!get_isodir_info(g_isodir_device, g_isodir_format, bkpinfo, nuke_me_please)) {
+if (!get_isodir_info(g_isodir_device, g_isodir_format, nuke_me_please)) {
     return (1);
 }
@@ -678 +676 @@
 /** malloc **/
 char *tmp = NULL;
-char *tmp1 = NULL;
 char *command = NULL;
 char *mountdir = NULL;
@@ -2258 +2255 @@
 /* @} - end restoreUtilityGroup */
 
-void wait_until_software_raids_are_prepped(char *mdstat_file, int wait_for_percentage)
+void wait_until_software_raids_are_prepped(int wait_for_percentage)
 {
     struct raidlist_itself *raidlist;