Changeset 588 in MondoRescue for trunk/mondo/mondo/common/libmondo-raid.c


Ignore:
Timestamp:
May 29, 2006, 11:47:20 AM (14 years ago)
Author:
bcornec
Message:

merge -r 560:587 $SVN_M/branches/stable

File:
1 edited

Legend:

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

    r561 r588  
    993993    paranoid_free(token);
    994994    // skip ':' and status
    995     token = strtok (string, delims, &lastpos);
     995    token = mr_strtok (string, delims, &lastpos);
    996996    paranoid_free(token);
    997     token = strtok (string, delims, &lastpos);
     997    token = mr_strtok (string, delims, &lastpos);
    998998    if (!strcmp(token, "inactive")) {
    999999      log_msg(1, "RAID device '%s' inactive.\n",
     
    10061006
    10071007    // get RAID level
    1008     token = strtok (string, delims, &lastpos);
     1008    token = mr_strtok (string, delims, &lastpos);
    10091009    if (!strcmp(token, "multipath")) {
    10101010      raidlist->el[raidlist->entries].raid_level = -2;
     
    10361036    raidlist->el[raidlist->entries].spare_disks.entries = 0;
    10371037    raidlist->el[raidlist->entries].failed_disks.entries = 0;
    1038     while((token = strtok (string, delims, &lastpos))) {
     1038    while((token = mr_strtok (string, delims, &lastpos))) {
    10391039      if ((pos = strstr(token, "("))) {
    10401040        type = *(pos+1);
Note: See TracChangeset for help on using the changeset viewer.