From: Jan Safranek <jsafrane@redhat.com>
Date: Tue, 16 Nov 2010 11:11:28 +0000 (+0100)
Subject: Fix exit code in the event of display_controller_values failure
X-Git-Tag: v0.37~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dee92cc308ff7c16b6cc9ff2ad07af88e8b543d6;p=thirdparty%2Flibcgroup.git

Fix exit code in the event of display_controller_values failure

Just store the error into 'result' on error, 'ret' is not used.

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 1d3ad55c..87cdc8e7 100644
--- a/src/tools/cgget.c
+++ b/src/tools/cgget.c
@@ -381,8 +381,10 @@ int main(int argc, char *argv[])
 
 		ret = display_controller_values(controllers, c_number, argv[i],
 			argv[0], mode - (mode & MODE_SHOW_ALL_CONTROLLERS));
-		if (ret)
+		if (ret) {
+			result = ret;
 			goto err;
+		}
 
 		if (mode & MODE_SHOW_ALL_CONTROLLERS) {
 			ret = display_all_controllers(argv[i], argv[0], mode);