X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Flttng.c;h=8d6c8e621e83eadd3d18a08e385ad0b474e98940;hp=10b5d191e84dc068a0ed713760990ac4e798ce27;hb=c6d4a597213c93a865e05f93227b108ed2a79761;hpb=97e190465f6a2a7d5bf72f445bb4d9d8544a0916

diff --git a/src/bin/lttng/lttng.c b/src/bin/lttng/lttng.c
index 10b5d191e..8d6c8e621 100644
--- a/src/bin/lttng/lttng.c
+++ b/src/bin/lttng/lttng.c
@@ -2,9 +2,8 @@
  * Copyright (c)  2011 David Goulet <david.goulet@polymtl.ca>
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * as published by the Free Software Foundation; only version 2
- * of the License.
+ * it under the terms of the GNU General Public License, version 2 only,
+ * as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -80,7 +79,7 @@ static struct cmd_struct commands[] =  {
 
 static void usage(FILE *ofp)
 {
-	fprintf(ofp, "LTTng Trace Control " VERSION"\n\n");
+	fprintf(ofp, "LTTng Trace Control " VERSION" - " VERSION_NAME"\n\n");
 	fprintf(ofp, "usage: lttng [OPTIONS] <COMMAND>\n");
 	fprintf(ofp, "\n");
 	fprintf(ofp, "Options:\n");
@@ -502,7 +501,9 @@ static int parse_args(int argc, char **argv)
 	case 0:
 		break;
 	default:
-		ERR("%s", lttng_strerror(ret));
+		if (ret < 0) {
+			ret = -ret;
+		}
 		break;
 	}