Ignore:
Timestamp:
Jan 28, 2007, 7:04:41 PM (12 years ago)
Author:
bruno
Message:
  • Fix mindi install messages (reported by Andree Leidenfrost)
  • remove paranoid_free/free for mr_free
  • mr_asprintf used everywhere
  • mr_malloc used everywhere
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/mondo/src/common/libmondo-mountlist.c

    r1075 r1080  
    1 /* libmondo-mountlist.c                            subroutines for handling mountlist
     1/* subroutines for handling mountlist
    22   $Id$
    33*/
     
    1818#include "libmondo-string-EXT.h"
    1919#include "libmondo-gui-EXT.h"
     20#include "mr_mem.h"
    2021
    2122/*@unused@*/
     
    488489
    489490  endoffunc:
    490     paranoid_free(tmp);
    491     paranoid_free(device);
    492     paranoid_free(mountpoint);
     491    mr_free(tmp);
     492    mr_free(device);
     493    mr_free(mountpoint);
    493494
    494495    if (res) {
     
    528529    /*@ initialize ******************************************************* */
    529530
    530     drivelist = malloc(sizeof(struct list_of_disks));
     531    drivelist = mr_malloc(sizeof(struct list_of_disks));
    531532    malloc_string(tmp);
    532533    malloc_string(flaws_str);
     
    591592         && strcmp(mountlist->el[i].device, device) != 0; i++);
    592593
    593     paranoid_free(tmp);
    594     paranoid_free(flaws_str);
     594    mr_free(tmp);
     595    mr_free(flaws_str);
    595596
    596597    if (i == mountlist->entries) {
     
    651652        }
    652653    }
    653     paranoid_free(curr_mountpoint);
    654     paranoid_free(tmp);
     654    mr_free(curr_mountpoint);
     655    mr_free(tmp);
    655656    return (res);
    656657}
     
    702703        }
    703704    }
    704     paranoid_free(tmp);
    705     paranoid_free(format_sz);
     705    mr_free(tmp);
     706    mr_free(format_sz);
    706707    return (res);
    707708}
     
    783784    drivelist->entries = noof_drives;
    784785    log_msg(8, "Made list of drives");
    785     paranoid_free(drive);
    786     paranoid_free(tmp);
     786    mr_free(drive);
     787    mr_free(tmp);
    787788
    788789    return (noof_drives);
     
    844845    output_list->entries = items;
    845846    log_it("MLUORP -- ending");
    846     paranoid_free(tmp);
     847    mr_free(tmp);
    847848}
    848849
     
    911912        log_it("Unable to open mountlist - '%s'", fname);
    912913        log_to_screen("Cannot open mountlist");
    913         paranoid_free(incoming);
    914         paranoid_free(siz);
    915         paranoid_free(tmp);
     914        mr_free(incoming);
     915        mr_free(siz);
     916        mr_free(tmp);
    916917        return (1);
    917918    }
     
    9991000    sprintf(tmp, "%d entries in mountlist", items);
    10001001    log_it(tmp);
    1001     paranoid_free(incoming);
    1002     paranoid_free(siz);
    1003     paranoid_free(tmp);
     1002    mr_free(incoming);
     1003    mr_free(siz);
     1004    mr_free(tmp);
    10041005    return (0);
    10051006}
Note: See TracChangeset for help on using the changeset viewer.