Changeset af2a76c in mainline for uspace/srv/fs/fat/fat_ops.c

Timestamp:

2014-07-13T17:25:15Z (10 years ago)

Author:

Agnieszka Tabaka <nufcia@…>

Branches:

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

Children:

7493e7b

Parents:

b8e75319 (diff), 78192cc7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/srv/fs/fat/fat_ops.c (modified) (1 diff)

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