Changeset 1103 in MondoRescue for branches/stable/mondo/src/mondorestore

Timestamp:

Feb 6, 2007, 11:10:01 AM (17 years ago)

Author:

Bruno Cornec

Message:

Fix again another set of compiler warnings (Michel Loiseleur <mloiseleur_at_linagora.com>)

Location:

branches/stable/mondo/src/mondorestore

Files:

• mondo-prep.c (modified) (2 diffs)
• mondo-rstr-newt.c (modified) (7 diffs)
• mondo-rstr-newt.h (modified) (1 diff)
• mondo-rstr-tools-EXT.h (modified) (1 diff)
• mondo-rstr-tools.c (modified) (4 diffs)
• mondo-rstr-tools.h (modified) (1 diff)

branches/stable/mondo/src/mondorestore/mondo-prep.c

@@ -2002 +2002 @@
     system("clear");
     newtResume();
-    mr_free(drivelist);
+    mr_free((void*) drivelist);
     return (retval);
 }
@@ -2605 +2605 @@
     }
     log_to_screen("Mountlist adjusted to suit current hard drive(s)");
-    mr_free(drivelist);
+    mr_free((void*) drivelist);
 }
 

branches/stable/mondo/src/mondorestore/mondo-rstr-newt.c

@@ -76 +76 @@
     /** int ****************************************************************/
     int i = 0;
-    int index = 0;
+    int idx = 0;
     int currline = 0;
     int items = 0;
@@ -109 +109 @@
             log_it("I don't know what this button does");
         } else {
-            index = find_next_free_index_in_disklist(disklist);
+            idx = find_next_free_index_in_disklist(disklist);
 
             items = disklist->entries;
             strcpy(disklist->el[items].device,
                    unallocated_raid_partitions->el[currline].device);
-            disklist->el[items].index = index;
+            disklist->el[items].index = idx;
             disklist->entries = ++items;
 
@@ -1660 +1660 @@
     mr_free(sz_parity_disks);
     mr_free(sz_failed_disks);
-    mr_free(bkp_raidrec);
+    mr_free((void*) bkp_raidrec);
 #endif
 }
@@ -2188 +2188 @@
 
     /** int ***************************************************************/
-    int index = -1;
+    int idx = -1;
     int pos = 0;
 
@@ -2198 +2198 @@
     for (done = FALSE; !done;) {
         for (pos = 0;
-             pos < disklist->entries && disklist->el[pos].index <= index;
+             pos < disklist->entries && disklist->el[pos].index <= idx;
              pos++);
         if (pos >= disklist->entries) {
             done = TRUE;
         } else {
-            index = disklist->el[pos].index;
-        }
-    }
-    return (index + 1);
+            idx = disklist->el[pos].index;
+        }
+    }
+    return (idx + 1);
 }
 
@@ -2389 +2389 @@
  * Dummy function that proves that we can get to the point where Mondo is run.
  */
-void nuke_mode_dummy()
+void nuke_mode_dummy(void)
 {
 
@@ -2846 +2846 @@
     mr_free(sz_res);
     mr_free(header_text);
-    mr_free(bkp_raidrec);
-    mr_free(bkp_disklist);
-    mr_free(bkp_raidlist);
-    mr_free(unallocated_raid_partitions);
+    mr_free((void*) bkp_raidrec);
+    mr_free((void*) bkp_disklist);
+    mr_free((void*) bkp_raidlist);
+    mr_free((void*) unallocated_raid_partitions);
 }
 #endif

branches/stable/mondo/src/mondorestore/mondo-rstr-newt.h

@@ -157 +157 @@
 char *mountlist_entry_to_string(struct mountlist_itself *, int);
 void mvaddstr_and_log_it(int, int, char *);
-void nuke_mode_dummy();
+void nuke_mode_dummy(void);
 char *number_of_disks_as_string(int, char *);
 void open_evalcall_form(char *);

branches/stable/mondo/src/mondorestore/mondo-rstr-tools-EXT.h

@@ -3 +3 @@
  */
 
-extern void free_MR_global_filenames();
+extern void free_MR_global_filenames(void);
 extern void get_cfg_file_from_archive_or_bust(struct s_bkpinfo *);
 extern bool is_file_in_list(char *, char *, char *);    /* needle, haystack, preamble */

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

@@ -53 +53 @@
  * Free the malloc()s for the filename variables.
  */
-void free_MR_global_filenames()
+void free_MR_global_filenames(void)
 {
     mr_free(g_biggielist_txt);
@@ -556 +556 @@
     }
     run_program_and_log_output("df -m", 3);
-    mr_free(mountlist);
+    mr_free((void*) mountlist);
     mr_free(tmp);
     mr_free(format);
@@ -2178 +2178 @@
         log_to_screen("All partitions were unmounted OK.");
     }
-    mr_free(mountlist);
+    mr_free((void*) mountlist);
     mr_free(command);
     mr_free(tmp);
@@ -2557 +2557 @@
     }
     mr_free(screen_message);
-    mr_free(raidlist);
-}
+    mr_free((void*) raidlist);
+}

branches/stable/mondo/src/mondorestore/mondo-rstr-tools.h

@@ -3 +3 @@
  */
 
-void free_global_filenames();
+void free_global_filenames(void);
 void get_cfg_file_from_archive_or_bust(struct s_bkpinfo *);
 bool is_file_in_list(char *, char *, char *);   /* needle, haystack, preamble */