cgsnapshot: fixed return value checks in parse_mountpoints()

The function should return an error when (and only when) something goes
wrong.

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

diff --git a/src/tools/cgsnapshot.c b/src/tools/cgsnapshot.c
index 404d54ad492e793258577fe9d7ee510cbe4d7e46..12474881709177d03a61ece05716ef7255983b8f 100644 (file)
--- a/src/tools/cgsnapshot.c
+++ b/src/tools/cgsnapshot.c
@@ -626,7 +626,7 @@ static int show_mountpoints(const char *controller)
 static int parse_mountpoints(cont_name_t cont_names[CG_CONTROLLER_MAX],
        const char *program_name)
 {
-       int ret, final_ret;
+       int ret, final_ret = 0;
        void *handle;
        struct controller_data info;
        struct cgroup_mount_point mount;
@@ -660,9 +660,9 @@ static int parse_mountpoints(cont_name_t cont_names[CG_CONTROLLER_MAX],
                                cgroup_strerror(ret));
                        return ret;
                }
+               final_ret = ret;
        }
 
-       final_ret = ret;
        cgroup_get_all_controller_end(&handle);
 
        /* process also named hierarchies */
@@ -688,7 +688,7 @@ static int parse_mountpoints(cont_name_t cont_names[CG_CONTROLLER_MAX],
 
        /* finish mount section */
        fprintf(of, "}\n\n");
-       return ret;
+       return final_ret;
 }
 
 int main(int argc, char *argv[])