Changeset 1106 in MondoRescue for trunk/mondo/src/mondorestore/mondo-rstr-tools.c

Timestamp:

Feb 7, 2007, 11:55:11 PM (17 years ago)

Author:

Bruno Cornec

Message:

merge -r1082:1105 $SVN_M/branches/stable

File:

• trunk/mondo/src/mondorestore/mondo-rstr-tools.c (modified) (9 diffs)

trunk/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -55 +55 @@
  * Free the malloc()s for the filename variables.
  */
-void free_MR_global_filenames()
+void free_MR_global_filenames(void)
 {
     mr_free(g_biggielist_txt);
@@ -537 +537 @@
 
     assert(p_external_copy_of_mountlist != NULL);
-    mountlist = mr_malloc(sizeof(struct mountlist_itself));
+    mountlist = (struct mountlist_itself *)mr_malloc(sizeof(struct mountlist_itself));
     memcpy((void *) mountlist, (void *) p_external_copy_of_mountlist,
            sizeof(struct mountlist_itself));
@@ -620 +620 @@
     }
     run_program_and_log_output("df -m", 3);
-    mr_free(mountlist);
+    mr_free((void*) mountlist);
     return (retval);
 }
@@ -918 +918 @@
 
     read_cfg_var(cfg_file, "acl", value);
-    if (strstr(value, "TRUE")) {
+    if (strstr(value, "yes")) {
         mr_asprintf(&g_getfacl,"setfacl");
         mr_msg(1, "We will restore ACLs");
@@ -926 +926 @@
     }
     read_cfg_var(cfg_file, "xattr", value);
-    if (strstr(value, "TRUE")) {
+    if (strstr(value, "yes")) {
         mr_asprintf(&g_getfattr,"setfattr");
         mr_msg(1, "We will restore XATTRs");
@@ -2027 +2027 @@
     assert(p_external_copy_of_mountlist != NULL);
 
-    mountlist = mr_malloc(sizeof(struct mountlist_itself));
+    mountlist = (struct mountlist_itself *)mr_malloc(sizeof(struct mountlist_itself));
     memcpy((void *) mountlist, (void *) p_external_copy_of_mountlist,
            sizeof(struct mountlist_itself));
@@ -2120 +2120 @@
         log_to_screen(_("All partitions were unmounted OK."));
     }
-    mr_free(mountlist);
+    mr_free((void*) mountlist);
     return (retval);
 }
@@ -2441 +2441 @@
     char *screen_message = NULL;
 
-    raidlist = mr_malloc(sizeof(struct raidlist_itself));
+    raidlist = (struct raidlist_itself *)mr_malloc(sizeof(struct raidlist_itself));
 
     assert(wait_for_percentage <= 100);
@@ -2479 +2479 @@
         }
     }
-    mr_free(raidlist);
-}
+    mr_free((void*) raidlist);
+}