Ignore:
Timestamp:
Jan 28, 2007, 11:20:07 PM (12 years ago)
Author:
bruno
Message:

merge -r1078:1080 $SVN_M/branches/stable

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/mondo/src/common/libmondo-raid.c

    r1079 r1081  
    1818#include "mr_mem.h"
    1919#include "mr_str.h"
     20#include "mr_mem.h"
    2021
    2122#ifdef __FreeBSD__
     
    817818    int i, j;
    818819    static char **ret;
    819     ret = (char **) malloc(nval * sizeof(char *));
     820    ret = (char **) mr_malloc(nval * sizeof(char *));
    820821    for (i = 0; i < (argc - nval); ++i) {
    821822        if (!strcmp(argv[i], option)) {
    822823            for (j = 0; j < nval; ++j) {
    823                 ret[j] = (char *) malloc(strlen(argv[i + j + 1]) + 1);
     824                ret[j] = (char *) mr_malloc(strlen(argv[i + j + 1]) + 1);
    824825                strcpy(ret[j], argv[i + j + 1]);
    825826            }
     
    11751176    int retval = 0;
    11761177
    1177     raidlist = malloc(sizeof(struct raidlist_itself));
     1178    raidlist = mr_malloc(sizeof(struct raidlist_itself));
    11781179
    11791180    // FIXME: Prefix '/dev/' should really be dynamic!
Note: See TracChangeset for help on using the changeset viewer.