cg_name(const char *root, const char *name) is always called with
non-empty root and name arguments, so there is no sense in checking
it in the function body (after using in strlen()).

Signed-off-by: Roman Gushchin <[email protected]>
Reported-by: Dan Carpenter <[email protected]>
Cc: [email protected]
---
 tools/testing/selftests/cgroup/cgroup_util.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tools/testing/selftests/cgroup/cgroup_util.c 
b/tools/testing/selftests/cgroup/cgroup_util.c
index 41cc3b5e5be1..b69bdeb4b9fe 100644
--- a/tools/testing/selftests/cgroup/cgroup_util.c
+++ b/tools/testing/selftests/cgroup/cgroup_util.c
@@ -59,8 +59,7 @@ char *cg_name(const char *root, const char *name)
        size_t len = strlen(root) + strlen(name) + 2;
        char *ret = malloc(len);
 
-       if (name)
-               snprintf(ret, len, "%s/%s", root, name);
+       snprintf(ret, len, "%s/%s", root, name);
 
        return ret;
 }
@@ -70,8 +69,7 @@ char *cg_name_indexed(const char *root, const char *name, int 
index)
        size_t len = strlen(root) + strlen(name) + 10;
        char *ret = malloc(len);
 
-       if (name)
-               snprintf(ret, len, "%s/%s_%d", root, name, index);
+       snprintf(ret, len, "%s/%s_%d", root, name, index);
 
        return ret;
 }
-- 
2.14.3

Reply via email to