Fix: change perror to PERROR in kernel consumer

[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 4ff6f785874f13cf3f0049381c1c8dac6679de2a..318896559ffeab50a9a19ab4892471a27c6c86c0 100644 (file)
--- a/src/bin/lttng/commands/list.c
+++ b/src/bin/lttng/commands/list.c
@@ -110,7 +110,7 @@ static void usage(FILE *ofp)
 static char *get_cmdline_by_pid(pid_t pid)
 {
        int ret;
-       FILE *fp;
+       FILE *fp = NULL;
        char *cmdline = NULL;
        char path[20];  /* Can't go bigger than /proc/65535/cmdline */
 
@@ -130,9 +130,11 @@ static char *get_cmdline_by_pid(pid_t pid)
        if (ret < 0) {
                perror("fread proc list");
        }
-       fclose(fp);
 
 end:
+       if (fp) {
+               fclose(fp);
+       }
        return cmdline;
 }
 
@@ -1277,7 +1279,6 @@ static int list_sessions(const char *session_name)
                                MSG("%sTrace path: %s", indent4, sessions[i].path);
                                MSG("%sLive timer interval (usec): %u\n", indent4,
                                                sessions[i].live_timer_interval);
-                               break;
                        }
                }
 
@@ -1463,7 +1464,7 @@ int cmd_list(int argc, const char **argv)
        } else if (opt_jul) {
                DBG2("Listing JUL domain");
                domain.type = LTTNG_DOMAIN_JUL;
-       } else if (opt_jul) {
+       } else if (opt_log4j) {
                domain.type = LTTNG_DOMAIN_LOG4J;
        }