X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=lttng%2Flttng.c;h=379cbb1fdbb6183377bb4e50664d0c84bdb2a1e8;hp=7c0abfaf211fd42ef309f9bf0eaa47e1ff329a61;hb=8490ae7b70872d03eda98f1fb2c76488a47e3084;hpb=eb9cb8b758bc88e9117fd0726646a7c9ae4f7984

diff --git a/lttng/lttng.c b/lttng/lttng.c
index 7c0abfaf2..379cbb1fd 100644
--- a/lttng/lttng.c
+++ b/lttng/lttng.c
@@ -39,7 +39,6 @@ static int opt_no_sessiond;
 static char *opt_sessiond_path;
 
 enum {
-	OPT_NO_SESSIOND,
 	OPT_SESSION_PATH,
 	OPT_DUMP_OPTIONS,
 	OPT_DUMP_COMMANDS,
@@ -51,7 +50,7 @@ static struct option long_options[] = {
 	{"group",            1, NULL, 'g'},
 	{"verbose",          0, NULL, 'v'},
 	{"quiet",            0, NULL, 'q'},
-	{"no-sessiond",      0, NULL, OPT_NO_SESSIOND},
+	{"no-sessiond",      0, NULL, 'n'},
 	{"sessiond-path",    1, NULL, OPT_SESSION_PATH},
 	{"list-options",     0, NULL, OPT_DUMP_OPTIONS},
 	{"list-commands",    0, NULL, OPT_DUMP_COMMANDS},
@@ -86,7 +85,7 @@ static void usage(FILE *ofp)
 	fprintf(ofp, "  -g, --group NAME       Unix tracing group name. (default: tracing)\n");
 	fprintf(ofp, "  -v, --verbose          Verbose mode\n");
 	fprintf(ofp, "  -q, --quiet            Quiet mode\n");
-	fprintf(ofp, "      --no-sessiond      Don't spawn a session daemon\n");
+	fprintf(ofp, "  -n, --no-sessiond      Don't spawn a session daemon\n");
 	fprintf(ofp, "      --sessiond-path    Session daemon full path\n");
 	fprintf(ofp, "      --list-options     Simple listing of lttng options\n");
 	fprintf(ofp, "      --list-commands    Simple listing of lttng commands\n");
@@ -373,7 +372,7 @@ static int parse_args(int argc, char **argv)
 		clean_exit(EXIT_FAILURE);
 	}
 
-	while ((opt = getopt_long(argc, argv, "+hvqg:", long_options, NULL)) != -1) {
+	while ((opt = getopt_long(argc, argv, "+hnvqg:", long_options, NULL)) != -1) {
 		switch (opt) {
 		case 'h':
 			usage(stderr);
@@ -387,7 +386,7 @@ static int parse_args(int argc, char **argv)
 		case 'g':
 			lttng_set_tracing_group(optarg);
 			break;
-		case OPT_NO_SESSIOND:
+		case 'n':
 			opt_no_sessiond = 1;
 			break;
 		case OPT_SESSION_PATH:
@@ -431,13 +430,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;
@@ -464,7 +463,9 @@ int main(int argc, char *argv[])
 	}
 
 	ret = parse_args(argc, argv);
-	clean_exit(ret);
+	if (ret < 0) {
+		clean_exit(EXIT_FAILURE);
+	}
 
 	return 0;
 }