Changeset 1103 in MondoRescue for branches/stable/mondo/src/mondorestore/mondo-rstr-newt.c

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>)

File:

• branches/stable/mondo/src/mondorestore/mondo-rstr-newt.c (modified) (7 diffs)

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