]> git.ipfire.org Git - thirdparty/libcgroup.git/commitdiff
Correctly process display_all_controllers return value
authorJan Safranek <jsafrane@redhat.com>
Tue, 16 Nov 2010 11:11:21 +0000 (12:11 +0100)
committerDhaval Giani <dhaval.giani@gmail.com>
Tue, 16 Nov 2010 15:39:16 +0000 (16:39 +0100)
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>
src/tools/cgget.c

index aad222a19e97cec00ac0634d83830b572f6f864f..1d3ad55cb8d75c9692d0c0e34012003ee3a04910 100644 (file)
@@ -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)