X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fenable_events.c;h=49bae56b23872013abda97ffe665acfc014d72da;hb=ca1c3607d2f5654163875cda874f43971df0f696;hp=0fa3e916c835b48e2d9228ac8c86ee1e0e4a5dcf;hpb=0cda4f28041a221757fa2dfa8e91706e7a548090;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/enable_events.c b/src/bin/lttng/commands/enable_events.c
index 0fa3e916c..49bae56b2 100644
--- a/src/bin/lttng/commands/enable_events.c
+++ b/src/bin/lttng/commands/enable_events.c
@@ -341,7 +341,7 @@ static int enable_events(char *session_name)
 				goto error;
 			}
 
-			if (opt_loglevel[0] != '\0') {
+			if (opt_loglevel) {
 				MSG("Kernel loglevels are not supported.");
 				ret = CMD_UNDEFINED;
 				goto error;
@@ -381,8 +381,12 @@ static int enable_events(char *session_name)
 			}
 
 			ev.loglevel_type = opt_loglevel_type;
-			strncpy(ev.loglevel, opt_loglevel, LTTNG_SYMBOL_NAME_LEN);
-			ev.loglevel[LTTNG_SYMBOL_NAME_LEN - 1] = '\0';
+			if (opt_loglevel) {
+				strncpy(ev.loglevel, opt_loglevel, LTTNG_SYMBOL_NAME_LEN);
+				ev.loglevel[LTTNG_SYMBOL_NAME_LEN - 1] = '\0';
+			} else {
+				ev.loglevel[0] = '\0';
+			}
 		} else {
 			ERR("Please specify a tracer (-k/--kernel or -u/--userspace)");
 			goto error;
@@ -413,7 +417,7 @@ error:
  */
 int cmd_enable_events(int argc, const char **argv)
 {
-	int opt, ret;
+	int opt, ret = CMD_SUCCESS;
 	static poptContext pc;
 	char *session_name = NULL;
 
@@ -426,8 +430,7 @@ int cmd_enable_events(int argc, const char **argv)
 	while ((opt = poptGetNextOpt(pc)) != -1) {
 		switch (opt) {
 		case OPT_HELP:
-			usage(stderr);
-			ret = CMD_SUCCESS;
+			usage(stdout);
 			goto end;
 		case OPT_TRACEPOINT:
 			opt_event_type = LTTNG_EVENT_TRACEPOINT;
@@ -457,7 +460,6 @@ int cmd_enable_events(int argc, const char **argv)
 			break;
 		case OPT_LIST_OPTIONS:
 			list_cmd_options(stdout, long_options);
-			ret = CMD_SUCCESS;
 			goto end;
 		default:
 			usage(stderr);
@@ -470,14 +472,14 @@ int cmd_enable_events(int argc, const char **argv)
 	if (opt_event_list == NULL && opt_enable_all == 0) {
 		ERR("Missing event name(s).\n");
 		usage(stderr);
-		ret = CMD_SUCCESS;
+		ret = CMD_ERROR;
 		goto end;
 	}
 
 	if (!opt_session_name) {
 		session_name = get_session_name();
 		if (session_name == NULL) {
-			ret = -1;
+			ret = CMD_ERROR;
 			goto end;
 		}
 	} else {
@@ -491,5 +493,6 @@ end:
 		free(session_name);
 	}
 
+	poptFreeContext(pc);
 	return ret;
 }