conf: s/strtok_r()/lxc_iterate_parts()/g

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index f5b94b091aaa9b1002899d80cb7a27a1fd4b7a4d..ff9bd091b21e16397a32fa7b977f76ae52cefeb8 100644 (file)
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -1888,7 +1888,6 @@ static void parse_mntopt(char *opt, unsigned long *flags, char **data, size_t si
 int parse_mntopts(const char *mntopts, unsigned long *mntflags, char **mntdata)
 {
        char *data, *p, *s;
-       char *saveptr = NULL;
        size_t size;
 
        *mntdata = NULL;
@@ -1909,7 +1908,7 @@ int parse_mntopts(const char *mntopts, unsigned long *mntflags, char **mntdata)
        }
        *data = 0;
 
-       for (; (p = strtok_r(s, ",", &saveptr)); s = NULL)
+       lxc_iterate_parts(p, s, ",")
                parse_mntopt(p, mntflags, &data, size);
 
        if (*data)
@@ -1942,7 +1941,6 @@ static void parse_propagationopt(char *opt, unsigned long *flags)
 static int parse_propagationopts(const char *mntopts, unsigned long *pflags)
 {
        char *p, *s;
-       char *saveptr = NULL;
 
        if (!mntopts)
                return 0;
@@ -1954,7 +1952,7 @@ static int parse_propagationopts(const char *mntopts, unsigned long *pflags)
        }
 
        *pflags = 0L;
-       for (; (p = strtok_r(s, ",", &saveptr)); s = NULL)
+       lxc_iterate_parts(p, s, ",")
                parse_propagationopt(p, pflags);
        free(s);