lttng-view: clean-up: rename `parse_options()` -> `parse_viewer_option()`

[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 0dd1623ea1f7dd5db575a60e550a482d583f411c..3ba5766ea00c0e45dd332126956434d579bdf7d9 100644 (file)
--- a/src/bin/lttng/commands/view.c
+++ b/src/bin/lttng/commands/view.c
@@ -58,11 +58,7 @@ enum viewer_type {
        VIEWER_USER_DEFINED  = 2,
 };
 
-/*
- * NOTE: "lttv" is a shell command and it's not working for exec() family
- * functions so we might think of removing this wrapper or using bash.
- */
-static const struct viewers {
+static const struct viewer {
        const char *exec_name;
        enum viewer_type type;
 } viewers[] = {
@@ -74,18 +70,13 @@ static const struct viewers {
 /* Is the session we are trying to view is in live mode. */
 static int session_live_mode;
 
-static const struct viewers *parse_options(void)
+static const struct viewer *parse_viewer_option(void)
 {
        if (opt_viewer == NULL) {
-               /* Default is babeltrace */
+               /* Default is babeltrace2 */
                return &(viewers[VIEWER_BABELTRACE2]);
        }
 
-       /*
-        * This means that if -e, --viewers is used, we just override everything
-        * with it. For supported viewers like lttv, we could simply detect if "-t"
-        * is passed and if not, add the trace directory to it.
-        */
        return &(viewers[VIEWER_USER_DEFINED]);
 }
 
@@ -180,8 +171,8 @@ static char **alloc_argv_from_local_opts(const char **opts, size_t opts_len,
        memcpy(argv, opts, sizeof(char *) * opts_len);
 
        if (session_live_mode) {
-               argv[opts_len] = "-i";
-               argv[opts_len + 1] = "lttng-live";
+               argv[opts_len] = (char *) "-i";
+               argv[opts_len + 1] = (char *) "lttng-live";
                argv[opts_len + 2] = (char *) trace_path;
                argv[opts_len + 3] = NULL;
        } else {
@@ -201,11 +192,11 @@ static int spawn_viewer(const char *trace_path)
        int ret = 0;
        struct stat status;
        const char *viewer_bin = NULL;
-       const struct viewers *viewer;
+       const struct viewer *viewer;
        char **argv = NULL;
 
-       /* Check for --viewer options */
-       viewer = parse_options();
+       /* Check for --viewer option. */
+       viewer = parse_viewer_option();
        if (viewer == NULL) {
                ret = CMD_ERROR;
                goto error;