X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fview.c;h=db13ee22718d9fcc0c4eb9636bcd9593ef012032;hb=e1f481f68598431b2b9eca264a2ec0c7f5aea686;hp=44e0cb015c93e90bc31cc553bead112f368602cd;hpb=890d8fe47755c3bad936389cf48ffa141cff41c9;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/view.c b/src/bin/lttng/commands/view.c
index 44e0cb015..db13ee227 100644
--- a/src/bin/lttng/commands/view.c
+++ b/src/bin/lttng/commands/view.c
@@ -78,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) {
@@ -277,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;
 }
 
@@ -444,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;
 		}