X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lttng%2Flttng.c;h=77006bc7f63ab11834bb3b6286e8d69f7af58f55;hb=1fff1faa8195b6959cd53ca9cd7a51aa512db4ac;hp=e6e657cc1ec4e59438bd011b55f5345de7894d19;hpb=865abf6508f89f0ef1fc37e415cfc49237092516;p=lttng-tools.git

diff --git a/lttng/lttng.c b/lttng/lttng.c
index e6e657cc1..77006bc7f 100644
--- a/lttng/lttng.c
+++ b/lttng/lttng.c
@@ -72,6 +72,7 @@ static struct cmd_struct commands[] =  {
 	{ "disable-channel", cmd_disable_channels},
 	{ "add-context", cmd_add_context},
 	{ "set-session", cmd_set_session},
+	{ "version", cmd_version},
 	{ NULL, NULL}	/* Array closure */
 };
 
@@ -430,13 +431,13 @@ static int parse_args(int argc, char **argv)
 	if (ret < 0) {
 		if (ret == -1) {
 			usage(stderr);
-			goto error;
 		} else {
 			ERR("%s", lttng_get_readable_code(ret));
 		}
+		goto error;
 	}
 
-	return ret;
+	return 0;
 
 error:
 	return -1;
@@ -463,7 +464,9 @@ int main(int argc, char *argv[])
 	}
 
 	ret = parse_args(argc, argv);
-	clean_exit(ret);
+	if (ret < 0) {
+		clean_exit(EXIT_FAILURE);
+	}
 
 	return 0;
 }