tools/cgxset: fix unused value in main

Fix unused value, reported by the Coverity tool:

CID 320876 (#1 of 1): Unused value (UNUSED_VALUE)assigned_value:
Assigning value 0 to ret here, but that stored value is overwritten
before it can be used.

If the mapping from v1->v2 and vice versa fail, with -i
(ignore-unmappable) set, ret is set to zero and is immediately
over-written, re-arrange the check, and adjust the commentary to avoid
clobbering ret, by taking the error path when -i is unset or else
continuing when set, skipping to set ret to zero.

Suggested-by: Tom Hromatka <tom.hromatka@oracle.com>
Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com>
Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>

diff --git a/src/tools/cgxset.c b/src/tools/cgxset.c
index 2ca4cea5e74db11cd8b397f67c3f0066ff56ee3e..e5eba5284c43bb55cacbf7f52d128baf0b21c801 100644 (file)
--- a/src/tools/cgxset.c
+++ b/src/tools/cgxset.c
@@ -303,14 +303,13 @@ int main(int argc, char *argv[])
 
                ret = cgroup_convert_cgroup(converted_src_cgroup, CGROUP_DISK, src_cgroup,
                                            src_version);
-               if (ret == ECGNOVERSIONCONVERT && ignore_unmappable)
+               if ((ret && ret != ECGNOVERSIONCONVERT) ||
+                   (ret == ECGNOVERSIONCONVERT && !ignore_unmappable)) {
                        /*
-                        * The user has specified that we should ignore
-                        * any errors due to being unable to map from
-                        * v1 to v2 or vice versa
+                        * If the user not has specified that we ignore any errors
+                        * due to being unable to map from v1 to v2 or vice versa,
+                        * return error, else ignore the error and continue.
                         */
-                       ret = 0;
-               else if (ret) {
                        free(converted_src_cgroup);
                        goto err;
                }