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

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

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

diff --git a/src/lxc/state.c b/src/lxc/state.c
index 3ccbe583a..5afce9a6a 100644
--- a/src/lxc/state.c
+++ b/src/lxc/state.c
@@ -43,6 +43,7 @@
 #include "lxc.h"
 #include "monitor.h"
 #include "start.h"
+#include "utils.h"
 
 lxc_log_define(state, lxc);
 
@@ -78,16 +79,15 @@ lxc_state_t lxc_getstate(const char *name, const char *lxcpath)
 
 static int fillwaitedstates(const char *strstates, lxc_state_t *states)
 {
-	char *token, *saveptr = NULL;
-	char *strstates_dup = strdup(strstates);
+	char *token;
+	char *strstates_dup;
 	int state;
 
+	strstates_dup = strdup(strstates);
 	if (!strstates_dup)
 		return -1;
 
-	token = strtok_r(strstates_dup, "|", &saveptr);
-	while (token) {
-
+	lxc_iterate_parts(token, strstates_dup, "|") {
 		state = lxc_str2state(token);
 		if (state < 0) {
 			free(strstates_dup);
@@ -95,8 +95,6 @@ static int fillwaitedstates(const char *strstates, lxc_state_t *states)
 		}
 
 		states[state] = 1;
-
-		token = strtok_r(NULL, "|", &saveptr);
 	}
 	free(strstates_dup);
 	return 0;