Changeset 565 for branches/stable


Ignore:
Timestamp:
May 20, 2006, 11:54:48 PM (13 years ago)
Author:
bcornec
Message:

strtok wasn't completely replaced :-(

Location:
branches/stable/mondo/mondo/common
Files:
3 edited

Legend:

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

    r560 r565  
    10671067    paranoid_free(token);
    10681068    // skip ':' and status
    1069     token = strtok (string, delims, &lastpos);
     1069    token = mr_strtok (string, delims, &lastpos);
    10701070    paranoid_free(token);
    1071     token = strtok (string, delims, &lastpos);
     1071    token = mr_strtok (string, delims, &lastpos);
    10721072    if (!strcmp(token, "inactive")) {
    10731073      log_msg(1, "RAID device '%s' inactive.\n",
     
    10801080
    10811081    // get RAID level
    1082     token = strtok (string, delims, &lastpos);
     1082    token = mr_strtok (string, delims, &lastpos);
    10831083    if (!strcmp(token, "multipath")) {
    10841084      raidlist->el[raidlist->entries].raid_level = -2;
     
    11101110    raidlist->el[raidlist->entries].spare_disks.entries = 0;
    11111111    raidlist->el[raidlist->entries].failed_disks.entries = 0;
    1112     while((token = strtok (string, delims, &lastpos))) {
     1112    while((token = mr_strtok (string, delims, &lastpos))) {
    11131113      if ((pos = strstr(token, "("))) {
    11141114        type = *(pos+1);
  • branches/stable/mondo/mondo/common/libmondo-string-EXT.h

    r128 r565  
    4444extern inline void turn_wildcard_chars_into_literal_chars(char *out,
    4545                                                          char *in);
     46/* Valid external functions */
     47extern char *mr_strtok(char *instr, const char *delims, int *lastpos);
  • branches/stable/mondo/mondo/common/libmondo-string.h

    r557 r565  
    3636
    3737/* Valid external functions */
    38 char *mr_strtok(char *instr, const char *delims, int *lastpos)
     38char *mr_strtok(char *instr, const char *delims, int *lastpos);
Note: See TracChangeset for help on using the changeset viewer.