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

Timestamp:

May 29, 2006, 11:47:20 AM (18 years ago)

Author:

bcornec

Message:

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

File:

• trunk/mondo/mondo/common/libmondo-raid.c (modified) (3 diffs)

trunk/mondo/mondo/common/libmondo-raid.c

@@ -993 +993 @@
     paranoid_free(token);
     // skip ':' and status
-    token = strtok (string, delims, &lastpos);
+    token = mr_strtok (string, delims, &lastpos);
     paranoid_free(token);
-    token = strtok (string, delims, &lastpos);
+    token = mr_strtok (string, delims, &lastpos);
     if (!strcmp(token, "inactive")) {
       log_msg(1, "RAID device '%s' inactive.\n",
@@ -1006 +1006 @@
 
     // get RAID level
-    token = strtok (string, delims, &lastpos);
+    token = mr_strtok (string, delims, &lastpos);
     if (!strcmp(token, "multipath")) {
       raidlist->el[raidlist->entries].raid_level = -2;
@@ -1036 +1036 @@
     raidlist->el[raidlist->entries].spare_disks.entries = 0;
     raidlist->el[raidlist->entries].failed_disks.entries = 0;
-    while((token = strtok (string, delims, &lastpos))) {
+    while((token = mr_strtok (string, delims, &lastpos))) {
       if ((pos = strstr(token, "("))) {
         type = *(pos+1);