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

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

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

diff --git a/src/lxc/storage/storage.c b/src/lxc/storage/storage.c
index 95e664800..3e64a4a62 100644
--- a/src/lxc/storage/storage.c
+++ b/src/lxc/storage/storage.c
@@ -567,15 +567,13 @@ struct lxc_storage *storage_create(const char *dest, const char *type,
 	/* -B lvm,dir */
 	if (strchr(type, ',')) {
 		char *dup, *token;
-		char *saveptr = NULL;
 		size_t len;
 
 		len = strlen(type);
 		dup = alloca(len + 1);
 		(void)strlcpy(dup, type, len + 1);
 
-		for (token = strtok_r(dup, ",", &saveptr); token;
-		     token = strtok_r(NULL, ",", &saveptr)) {
+		lxc_iterate_parts(token, dup, ",") {
 			bdev = do_storage_create(dest, token, cname, specs);
 			if (bdev)
 				return bdev;