From: Jan Safranek <jsafrane@redhat.com>
Date: Tue, 16 Nov 2010 11:11:21 +0000 (+0100)
Subject: Correctly process display_all_controllers return value
X-Git-Tag: v0.37~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=39c51faa70685c403e733dd8f1b27cf5095721f0;p=thirdparty%2Flibcgroup.git

Correctly process display_all_controllers return value

Add missing return value assignment, as pointed out by Steve Grubb.

Changelog:
- indent the 'if (ret)' lower.

Signed-off-by: Jan Safranek <jsafrane@redhat.com>
Acked-by: Dhaval Giani <dhaval.giani@gmail.com>
Signed-off-by: Dhaval Giani <dhaval.giani@gmail.com>
---

diff --git a/src/tools/cgget.c b/src/tools/cgget.c
index aad222a1..1d3ad55c 100644
--- a/src/tools/cgget.c
+++ b/src/tools/cgget.c
@@ -384,10 +384,12 @@ int main(int argc, char *argv[])
 		if (ret)
 			goto err;
 
-		if (mode & MODE_SHOW_ALL_CONTROLLERS)
-			display_all_controllers(argv[i], argv[0], mode);
-		if (ret)
-			result = ret;
+		if (mode & MODE_SHOW_ALL_CONTROLLERS) {
+			ret = display_all_controllers(argv[i], argv[0], mode);
+			/* remember the error but continue showing the rest */
+			if (ret)
+				result = ret;
+		}
 
 		/* Separate each group with empty line. */
 		if (mode & MODE_SHOW_HEADERS && i != argc-1)