Changeset 588 in MondoRescue for trunk/mondo/mondo/common

Timestamp:

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

Author:

bcornec

Message:

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

Location:

trunk/mondo/mondo/common

Files:

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

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);

trunk/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);

trunk/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);

trunk/mondo/mondo/common/newt-specific.c

@@ -869 +869 @@
             newtCls();
             newtPushHelpLine
-                (_("Welcome to Mondo Rescue, by Hugo Rabson and the Internet. All rights reversed."));
+                (_("Welcome to Mondo Rescue, by Dev Team and the Internet. All rights reversed."));
             /*  newtDrawRootText(28,0,"Welcome to Mondo Rescue"); */
             newtDrawRootText(18, 0, WELCOME_STRING);