Changeset ee3f6f6 in mainline for uspace/srv

Timestamp:

2014-06-30T18:04:54Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

3daf1979

Parents:

ef1ddad

Message:

Removal of strtok() and strtok_r() in favour of str_tok().

Location:

uspace/srv

Files:

• fs/fat/fat_ops.c (modified) (1 diff)
• logger/initlvl.c (modified) (2 diffs)

uspace/srv/fs/fat/fat_ops.c

@@ -930 +930 @@
         /* Parse mount options. */
         char *mntopts = (char *) opts;
-        char *saveptr;
         char *opt;
-        while ((opt = strtok_r(mntopts, " ,", &saveptr)) != NULL) {
+        while ((opt = str_tok(mntopts, " ,", &mntopts)) != NULL) {
                 if (str_cmp(opt, "wtcache") == 0)
                         cmode = CACHE_MODE_WT;
                 else if (str_cmp(opt, "nolfn") == 0)
                         instance->lfn_enabled = false;
-                mntopts = NULL;
         }
 

uspace/srv/logger/initlvl.c

@@ -44 +44 @@
 {
         char *tmp;
-        char *key = strtok_r(setting, "=", &tmp);
-        char *value = strtok_r(NULL, "=", &tmp);
+        char *key = str_tok(setting, "=", &tmp);
+        char *value = str_tok(tmp, "=", &tmp);
         if (key == NULL)
                 return;
@@ -76 +76 @@
 {
         char *tmp;
-        char *single_setting = strtok_r(settings, " ", &tmp);
+        char *single_setting = str_tok(settings, " ", &tmp);
         while (single_setting != NULL) {
                 parse_single_level_setting(single_setting);
-                single_setting = strtok_r(NULL, " ", &tmp);
+                single_setting = str_tok(tmp, " ", &tmp);
         }
 }