From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Thu, 26 Jul 2018 14:10:27 +0000 (+0200)
Subject: namespace: s/strtok_r()/lxc_iterate_parts()/g
X-Git-Tag: lxc-3.1.0~191^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=803fd7bffec50ad9fbc8051d56f36898e7a9ff45;p=thirdparty%2Flxc.git

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

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

diff --git a/src/lxc/namespace.c b/src/lxc/namespace.c
index 9512bfe5e..5b26d64ba 100644
--- a/src/lxc/namespace.c
+++ b/src/lxc/namespace.c
@@ -232,7 +232,7 @@ extern int lxc_namespace_2_std_identifiers(char *namespaces)
 
 int lxc_fill_namespace_flags(char *flaglist, int *flags)
 {
-	char *token, *saveptr = NULL;
+	char *token;
 	int aflag;
 
 	if (!flaglist) {
@@ -240,15 +240,12 @@ int lxc_fill_namespace_flags(char *flaglist, int *flags)
 		return -1;
 	}
 
-	token = strtok_r(flaglist, "|", &saveptr);
-	while (token) {
+	lxc_iterate_parts(token, flaglist, "|") {
 		aflag = lxc_namespace_2_cloneflag(token);
 		if (aflag < 0)
 			return -1;
 
 		*flags |= aflag;
-
-		token = strtok_r(NULL, "|", &saveptr);
 	}
 
 	return 0;