Ignore:
Timestamp:
Feb 7, 2007, 11:55:11 PM (12 years ago)
Author:
bruno
Message:

merge -r1082:1105 $SVN_M/branches/stable

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/mondo/src/mondorestore/mondo-rstr-tools.c

    r1086 r1106  
    5555 * Free the malloc()s for the filename variables.
    5656 */
    57 void free_MR_global_filenames()
     57void free_MR_global_filenames(void)
    5858{
    5959    mr_free(g_biggielist_txt);
     
    537537
    538538    assert(p_external_copy_of_mountlist != NULL);
    539     mountlist = mr_malloc(sizeof(struct mountlist_itself));
     539    mountlist = (struct mountlist_itself *)mr_malloc(sizeof(struct mountlist_itself));
    540540    memcpy((void *) mountlist, (void *) p_external_copy_of_mountlist,
    541541           sizeof(struct mountlist_itself));
     
    620620    }
    621621    run_program_and_log_output("df -m", 3);
    622     mr_free(mountlist);
     622    mr_free((void*) mountlist);
    623623    return (retval);
    624624}
     
    918918
    919919    read_cfg_var(cfg_file, "acl", value);
    920     if (strstr(value, "TRUE")) {
     920    if (strstr(value, "yes")) {
    921921        mr_asprintf(&g_getfacl,"setfacl");
    922922        mr_msg(1, "We will restore ACLs");
     
    926926    }
    927927    read_cfg_var(cfg_file, "xattr", value);
    928     if (strstr(value, "TRUE")) {
     928    if (strstr(value, "yes")) {
    929929        mr_asprintf(&g_getfattr,"setfattr");
    930930        mr_msg(1, "We will restore XATTRs");
     
    20272027    assert(p_external_copy_of_mountlist != NULL);
    20282028
    2029     mountlist = mr_malloc(sizeof(struct mountlist_itself));
     2029    mountlist = (struct mountlist_itself *)mr_malloc(sizeof(struct mountlist_itself));
    20302030    memcpy((void *) mountlist, (void *) p_external_copy_of_mountlist,
    20312031           sizeof(struct mountlist_itself));
     
    21202120        log_to_screen(_("All partitions were unmounted OK."));
    21212121    }
    2122     mr_free(mountlist);
     2122    mr_free((void*) mountlist);
    21232123    return (retval);
    21242124}
     
    24412441    char *screen_message = NULL;
    24422442
    2443     raidlist = mr_malloc(sizeof(struct raidlist_itself));
     2443    raidlist = (struct raidlist_itself *)mr_malloc(sizeof(struct raidlist_itself));
    24442444
    24452445    assert(wait_for_percentage <= 100);
     
    24792479        }
    24802480    }
    2481     mr_free(raidlist);
    2482 }
     2481    mr_free((void*) raidlist);
     2482}
Note: See TracChangeset for help on using the changeset viewer.