From: Jan Safranek Date: Wed, 24 Aug 2011 09:39:26 +0000 (+0200) Subject: cgsnapshot: fixed return value checks in parse_mountpoints() X-Git-Tag: v0.38~66 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db2beeb651685d8a7333bfd66d312fc9f0f8b6dd;p=thirdparty%2Flibcgroup.git 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 Acked-by: Dhaval Giani --- diff --git a/src/tools/cgsnapshot.c b/src/tools/cgsnapshot.c index 404d54ad..12474881 100644 --- 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[])