Fix missing strncmp return value comparison

Remove CMD_ERROR forced value in lttng cli list command.

Signed-off-by: David Goulet <dgoulet@efficios.com>

diff --git a/src/bin/lttng/commands/list.c b/src/bin/lttng/commands/list.c
index c22206952160c7bc6e477d4250feed230ed99000..da287f5caf9c4a7658b30f4419cf1be7aebb66bb 100644 (file)
--- a/src/bin/lttng/commands/list.c
+++ b/src/bin/lttng/commands/list.c
@@ -602,7 +602,6 @@ int cmd_list(int argc, const char **argv)
                if (!opt_kernel && !opt_userspace) {
                        ret = list_sessions(NULL);
                        if (ret < 0) {
-                               ret = CMD_ERROR;
                                goto end;
                        }
                }
@@ -624,7 +623,6 @@ int cmd_list(int argc, const char **argv)
                /* List session attributes */
                ret = list_sessions(session_name);
                if (ret < 0) {
-                       ret = CMD_ERROR;
                        goto end;
                }
 

diff --git a/src/bin/lttng/lttng.c b/src/bin/lttng/lttng.c
index 48658a42ddfb9d9e5f2a7ddd820f258bcd0914ac..f84ba63d7e8de48e4a9b6f44c79bbeffa72a7a89 100644 (file)
--- a/src/bin/lttng/lttng.c
+++ b/src/bin/lttng/lttng.c
@@ -399,7 +399,7 @@ static int check_args_no_sessiond(int argc, char **argv)
                                strncmp(argv[i], "--h", sizeof("--h")) == 0 ||
                                strncmp(argv[i], "--list-options", sizeof("--list-options")) == 0 ||
                                strncmp(argv[i], "--list-commands", sizeof("--list-commands")) == 0 ||
-                               strncmp(argv[i], "version", sizeof("version"))) {
+                               strncmp(argv[i], "version", sizeof("version")) == 0) {
                        return 1;
                }
        }