Clean-up: remove unnecessary blank line

[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 cb4b5074361ebbfe62cbbb83e01812353430b613..db13ee22718d9fcc0c4eb9636bcd9593ef012032 100644 (file)
--- a/src/bin/lttng/commands/view.c
+++ b/src/bin/lttng/commands/view.c
@@ -15,7 +15,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <popt.h>
 #include <stdio.h>
@@ -26,7 +25,6 @@
 #include <unistd.h>
 
 #include "../command.h"
-#include <config.h>
 
 static char *opt_session_name;
 static char *opt_viewer;
@@ -80,30 +78,6 @@ static struct viewers {
 /* Is the session we are trying to view is in live mode. */
 static int session_live_mode;
 
-/*
- * usage
- */
-static void usage(FILE *ofp)
-{
-       fprintf(ofp, "usage: lttng view [SESSION_NAME] [OPTIONS]\n");
-       fprintf(ofp, "\n");
-       fprintf(ofp, "By default, the babeltrace viewer will be used for text viewing\n");
-       fprintf(ofp, "\n");
-       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");
-       fprintf(ofp, "  -e, --viewer CMD         Specify viewer and/or options to use\n");
-       fprintf(ofp, "                           This will completely override the default viewers so\n");
-       fprintf(ofp, "                           please make sure to specify the full command. The trace\n");
-       fprintf(ofp, "                           directory path of the session will be appended at the end\n");
-       fprintf(ofp, "                           to the arguments\n");
-       fprintf(ofp, "\n");
-}
-
 static struct viewers *parse_options(void)
 {
        if (opt_viewer == NULL) {
@@ -111,12 +85,6 @@ static struct viewers *parse_options(void)
                return &(viewers[VIEWER_BABELTRACE]);
        }
 
-#if 0
-       if (strstr(opt_viewer, viewers[VIEWER_LTTV_GUI].exec_name) == 0) {
-               return &(viewers[VIEWER_LTTV_GUI]);
-       }
-#endif
-
        /*
         * 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"
@@ -173,6 +141,13 @@ static char **alloc_argv_from_user_opts(char *opts, const char *trace_path)
        return argv;
 
 error:
+       if (argv) {
+               for (i = 0; i < num_opts + 2; i++) {
+                       free(argv[i]);
+               }
+               free(argv);
+       }
+
        return NULL;
 }
 
@@ -251,17 +226,6 @@ static int spawn_viewer(const char *trace_path)
                argv = alloc_argv_from_local_opts(babeltrace_opts,
                                ARRAY_SIZE(babeltrace_opts), trace_path);
                break;
-#if 0
-       case VIEWER_LTTV_GUI:
-               if (stat(lttv_gui_bin, &status) == 0) {
-                       viewer_bin = lttv_gui_bin;
-               } else {
-                       viewer_bin = viewer->exec_name;
-               }
-               argv = alloc_argv_from_local_opts(lttv_gui_opts,
-                               ARRAY_SIZE(lttv_gui_opts), trace_path);
-               break;
-#endif
        case VIEWER_USER_DEFINED:
                argv = alloc_argv_from_user_opts(opt_viewer, trace_path);
                if (argv) {
@@ -275,7 +239,7 @@ static int spawn_viewer(const char *trace_path)
                break;
        }
 
-       if (argv == NULL) {
+       if (argv == NULL || !viewer_bin) {
                ret = CMD_FATAL;
                goto error;
        }
@@ -289,12 +253,12 @@ static int spawn_viewer(const char *trace_path)
                } else {
                        PERROR("exec: %s", viewer_bin);
                }
-               free(argv);
                ret = CMD_FATAL;
                goto error;
        }
 
 error:
+       free(argv);
        return ret;
 }
 
@@ -309,14 +273,14 @@ static char *build_live_path(char *session_name)
 
        ret = gethostname(hostname, sizeof(hostname));
        if (ret < 0) {
-               perror("gethostname");
+               PERROR("gethostname");
                goto error;
        }
 
        ret = asprintf(&path, "net://localhost/host/%s/%s", hostname,
                        session_name);
        if (ret < 0) {
-               perror("asprintf live path");
+               PERROR("asprintf live path");
                goto error;
        }
 
@@ -456,13 +420,12 @@ int cmd_view(int argc, const char **argv)
        while ((opt = poptGetNextOpt(pc)) != -1) {
                switch (opt) {
                case OPT_HELP:
-                       usage(stdout);
+                       SHOW_HELP();
                        goto end;
                case OPT_LIST_OPTIONS:
                        list_cmd_options(stdout, long_options);
                        goto end;
                default:
-                       usage(stderr);
                        ret = CMD_UNDEFINED;
                        goto end;
                }