cppcheck: don't check NULL pointer before freeing them

[lttng-tools.git] / src / bin / lttng / commands / list.c

diff --git a/src/bin/lttng/commands/list.c b/src/bin/lttng/commands/list.c
index 28e18644403142592ad2547476d8c41384d2163c..8fec91fac30ffe6cab6986ac7e717a75dbf18d36 100644 (file)
--- a/src/bin/lttng/commands/list.c
+++ b/src/bin/lttng/commands/list.c
@@ -474,9 +474,7 @@ static int list_events(const char *channel_name)
        MSG("");
 
 end:
-       if (events) {
-               free(events);
-       }
+       free(events);
        ret = CMD_SUCCESS;
 
 error:
@@ -680,8 +678,7 @@ error:
  */
 int cmd_list(int argc, const char **argv)
 {
-       int opt, i, ret = CMD_SUCCESS;
-       int nb_domain;
+       int opt, ret = CMD_SUCCESS;
        const char *session_name;
        static poptContext pc;
        struct lttng_domain domain;
@@ -745,6 +742,7 @@ int cmd_list(int argc, const char **argv)
                if (opt_kernel) {
                        ret = list_kernel_events();
                        if (ret < 0) {
+                               ret = CMD_ERROR;
                                goto end;
                        }
                }
@@ -755,6 +753,7 @@ int cmd_list(int argc, const char **argv)
                                ret = list_ust_events();
                        }
                        if (ret < 0) {
+                               ret = CMD_ERROR;
                                goto end;
                        }
                }
@@ -778,6 +777,8 @@ int cmd_list(int argc, const char **argv)
                                goto end;
                        }
                } else {
+                       int i, nb_domain;
+
                        /* We want all domain(s) */
                        nb_domain = lttng_list_domains(session_name, &domains);
                        if (nb_domain < 0) {
@@ -818,9 +819,7 @@ int cmd_list(int argc, const char **argv)
        }
 
 end:
-       if (domains) {
-               free(domains);
-       }
+       free(domains);
        if (handle) {
                lttng_destroy_handle(handle);
        }