Changeset 565 in MondoRescue for branches/stable

Timestamp:

May 20, 2006, 11:54:48 PM (18 years ago)

Author:

bcornec

Message:

strtok wasn't completely replaced :-(

Location:

branches/stable/mondo/mondo/common

Files:

• libmondo-raid.c (modified) (3 diffs)
• libmondo-string-EXT.h (modified) (1 diff)
• libmondo-string.h (modified) (1 diff)

branches/stable/mondo/mondo/common/libmondo-raid.c

@@ -1067 +1067 @@
     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",
@@ -1080 +1080 @@
 
     // 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;
@@ -1110 +1110 @@
     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);

branches/stable/mondo/mondo/common/libmondo-string-EXT.h

@@ -44 +44 @@
 extern inline void turn_wildcard_chars_into_literal_chars(char *out,
                                                           char *in);
+/* Valid external functions */
+extern char *mr_strtok(char *instr, const char *delims, int *lastpos);

branches/stable/mondo/mondo/common/libmondo-string.h

@@ -36 +36 @@
 
 /* Valid external functions */
-char *mr_strtok(char *instr, const char *delims, int *lastpos)
+char *mr_strtok(char *instr, const char *delims, int *lastpos);