From: Serge Hallyn <serge.hallyn@ubuntu.com>
Date: Wed, 13 Jan 2016 01:21:59 +0000 (-0800)
Subject: cgmanager: fix abuse of 'i'
X-Git-Tag: lxc-2.0.0.beta2~64
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=449710f84a08acfb1f9492103cfdb811107b7967;p=thirdparty%2Flxc.git

cgmanager: fix abuse of 'i'

we were initializing i to 0, then doing a while i <, but then a
separate commit (by myself) used i as a generic variable in between
those two.

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
---

diff --git a/src/lxc/cgmanager.c b/src/lxc/cgmanager.c
index 559628574..4c3a200c7 100644
--- a/src/lxc/cgmanager.c
+++ b/src/lxc/cgmanager.c
@@ -1286,7 +1286,7 @@ static bool verify_final_subsystems(const char *cgroup_use)
 {
 	int i = 0;
 	bool dropped_any = false;
-	bool ret = false;
+	bool bret = false;
 	const char *cgroup_pattern;
 	char tmpnam[50], *probe;
 
@@ -1305,7 +1305,7 @@ static bool verify_final_subsystems(const char *cgroup_use)
 	if (!probe)
 		goto out;
 
-	while (i < nr_subsystems) {
+	for (i = 0; i < nr_subsystems; i++) {
 		char *p = get_last_controller_in_list(subsystems[i]);
 
 		if (!subsys_is_writeable(p, probe)) {
@@ -1331,12 +1331,12 @@ static bool verify_final_subsystems(const char *cgroup_use)
 
 	if (dropped_any)
 		cgm_all_controllers_same = false;
-	ret = true;
+	bret = true;
 
 out:
 	free(probe);
 	cgm_dbus_disconnect();
-	return ret;
+	return bret;
 }
 
 static bool collect_subsytems(void)