]> git.ipfire.org Git - thirdparty/libcgroup.git/commitdiff
cgconfig: correct freeing default_cgroup
authorLibo Chen <libo.chen@huawei.com>
Tue, 10 Sep 2013 06:27:05 +0000 (08:27 +0200)
committerLibo Chen <libo.chen@huawei.com>
Tue, 10 Sep 2013 06:27:05 +0000 (08:27 +0200)
We are freeing up default_cgroup even it has not be allocated,
there is no need to do that.

Yes, it is just a cleanup suggested
by Dhaval Giani <dhaval.giani@gmail.com>

Signed-off-by: Libo Chen <clbchenlibo.chen@huawei.com>
Acked-by: Ivana Hutarova Varekova <varekova@redhat.com>
src/tools/cgconfig.c

index 495e8b65e60c4fab11c33956de3becff0efcfdd4..afbad647404f246f00088be903cc75e604f8a170 100644 (file)
@@ -160,7 +160,7 @@ int main(int argc, char *argv[])
        if (error) {
                fprintf(stderr, "%s: cannot set default UID and GID: %s\n",
                                argv[0], cgroup_strerror(error));
-               goto err;
+               goto free_cgroup;
        }
 
        if (dirm_change | filem_change) {
@@ -172,7 +172,7 @@ int main(int argc, char *argv[])
        if (error) {
                fprintf(stderr, "%s: cannot set config parser defaults: %s\n",
                                argv[0], cgroup_strerror(error));
-               goto err;
+               goto free_cgroup;
        }
 
        for (i = 0; i < cfg_files.count; i++) {
@@ -186,8 +186,9 @@ int main(int argc, char *argv[])
                }
        }
 
-err:
+free_cgroup:
        cgroup_free(&default_group);
+err:
        cgroup_string_list_free(&cfg_files);
        return error;
 }