X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fview.c;h=a13cb352510da0e3f2b60cc9a8c74f2b62f66870;hp=0325e505c505fab3dab2bc666fa7caec40822aa4;hb=8bf4946c164913124dc634eca8942c1f2c2fdd89;hpb=f12e3556cad1baa0af6993ae0072c19b317cbc34

diff --git a/src/bin/lttng/commands/view.c b/src/bin/lttng/commands/view.c
index 0325e505c..a13cb3525 100644
--- a/src/bin/lttng/commands/view.c
+++ b/src/bin/lttng/commands/view.c
@@ -30,7 +30,6 @@ static char *opt_session_name;
 static char *opt_viewer;
 static char *opt_trace_path;
 static const char *babeltrace_bin = CONFIG_BABELTRACE_BIN;
-//static const char *lttv_gui_bin = CONFIG_LTTV_GUI_BIN;
 
 #ifdef LTTNG_EMBED_HELP
 static const char help_msg[] =
@@ -56,7 +55,6 @@ static struct poptOption long_options[] = {
  * This is needed for each viewer since we are using execvp().
  */
 static const char *babeltrace_opts[] = { "babeltrace" };
-//static const char *lttv_gui_opts[] = { "lttv-gui", "-t", };
 
 /*
  * Type is also use as the index in the viewers array. So please, make sure
@@ -64,27 +62,25 @@ static const char *babeltrace_opts[] = { "babeltrace" };
  */
 enum viewer_type {
 	VIEWER_BABELTRACE    = 0,
-	VIEWER_LTTV_GUI      = 1,
-	VIEWER_USER_DEFINED  = 2,
+	VIEWER_USER_DEFINED  = 1,
 };
 
 /*
  * 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 struct viewers {
+static const struct viewers {
 	const char *exec_name;
 	enum viewer_type type;
 } viewers[] = {
 	{ "babeltrace", VIEWER_BABELTRACE },
-	{ "lttv-gui", VIEWER_LTTV_GUI },
 	{ NULL, VIEWER_USER_DEFINED },
 };
 
 /* Is the session we are trying to view is in live mode. */
 static int session_live_mode;
 
-static struct viewers *parse_options(void)
+static const struct viewers *parse_options(void)
 {
 	if (opt_viewer == NULL) {
 		/* Default is babeltrace */
@@ -169,7 +165,6 @@ static char **alloc_argv_from_local_opts(const char **opts, size_t opts_len,
 	char **argv;
 	size_t size, mem_len;
 
-
 	/* Add one for the NULL terminating element. */
 	mem_len = opts_len + 1;
 	if (session_live_mode) {
@@ -188,7 +183,7 @@ static char **alloc_argv_from_local_opts(const char **opts, size_t opts_len,
 		goto error;
 	}
 
-	memcpy(argv, opts, size);
+	memcpy(argv, opts, sizeof(char *) * opts_len);
 
 	if (session_live_mode) {
 		argv[opts_len] = "-i";
@@ -212,7 +207,7 @@ static int spawn_viewer(const char *trace_path)
 	int ret = 0;
 	struct stat status;
 	const char *viewer_bin = NULL;
-	struct viewers *viewer;
+	const struct viewers *viewer;
 	char **argv = NULL;
 
 	/* Check for --viewer options */