Fix: cppcheck linter cleanups

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

diff --git a/src/bin/lttng/commands/view.c b/src/bin/lttng/commands/view.c
index 9e7c9d91e55d8127e4e09d43169dd35dc14cfaa7..e3eff22ca394c6680babf7ef75a064bb7bc53b83 100644 (file)
--- a/src/bin/lttng/commands/view.c
+++ b/src/bin/lttng/commands/view.c
@@ -88,6 +88,7 @@ static void usage(FILE *ofp)
        fprintf(ofp, "Where SESSION_NAME is an optional session name. If not specified, lttng will\n");
        fprintf(ofp, "get it from the configuration file (.lttngrc).\n");
        fprintf(ofp, "\n");
+       fprintf(ofp, "Options:\n");
        fprintf(ofp, "  -h, --help               Show this help\n");
        fprintf(ofp, "      --list-options       Simple listing of options\n");
        fprintf(ofp, "  -t, --trace-path PATH    Trace directory path for the viewer\n");
@@ -258,7 +259,11 @@ static int spawn_viewer(const char *trace_path)
 
        ret = execvp(viewer_bin, argv);
        if (ret) {
-               PERROR("exec: %s", viewer_bin);
+               if (errno == ENOENT) {
+                       ERR("%s not found on the system", viewer_bin);
+               } else {
+                       PERROR("exec: %s", viewer_bin);
+               }
                free(argv);
                ret = CMD_FATAL;
                goto error;
@@ -273,7 +278,7 @@ error:
  */
 static int view_trace(void)
 {
-       int ret, count, i, found = 0;
+       int ret;
        char *session_name, *trace_path;
        struct lttng_session *sessions = NULL;
 
@@ -309,6 +314,8 @@ static int view_trace(void)
        DBG("Viewing trace for session %s", session_name);
 
        if (session_name) {
+               int i, count, found = 0;
+
                /* Getting all sessions */
                count = lttng_list_sessions(&sessions);
                if (count < 0) {
@@ -334,6 +341,13 @@ static int view_trace(void)
                }
 
                trace_path = sessions[i].path;
+
+               if (sessions[i].enabled) {
+                       WARN("Session %s is running. Please stop it before reading it.",
+                                       session_name);
+                       ret = CMD_ERROR;
+                       goto free_sessions;
+               }
        } else {
                trace_path = opt_trace_path;
        }
@@ -346,8 +360,6 @@ static int view_trace(void)
                goto free_sessions;
        }
 
-       ret = CMD_SUCCESS;
-
 free_sessions:
        if (sessions) {
                free(sessions);