X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fenable_events.c;h=231dac3fbd50c4cdf295c89c20ca1038182cedd5;hb=8f3f773f82cf4ce088d7bee098b549b5567d77f8;hp=1a53448c647ebd8469871b916258726649a78c5b;hpb=025faf73cdb6942ebf437dc4c4f6631f0134b128;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/enable_events.c b/src/bin/lttng/commands/enable_events.c
index 1a53448c6..231dac3fb 100644
--- a/src/bin/lttng/commands/enable_events.c
+++ b/src/bin/lttng/commands/enable_events.c
@@ -199,7 +199,7 @@ static int parse_probe_opts(struct lttng_event *ev, char *opt)
 		strncpy(ev->attr.probe.symbol_name, name, LTTNG_SYMBOL_NAME_LEN);
 		ev->attr.probe.symbol_name[LTTNG_SYMBOL_NAME_LEN - 1] = '\0';
 		DBG("probe symbol %s", ev->attr.probe.symbol_name);
-		if (strlen(s_hex) == 0) {
+		if (*s_hex == '\0') {
 			ERR("Invalid probe offset %s", s_hex);
 			ret = -1;
 			goto end;
@@ -227,7 +227,7 @@ static int parse_probe_opts(struct lttng_event *ev, char *opt)
 	/* Check for address */
 	ret = sscanf(opt, "%s", s_hex);
 	if (ret > 0) {
-		if (strlen(s_hex) == 0) {
+		if (*s_hex == '\0') {
 			ERR("Invalid probe address %s", s_hex);
 			ret = -1;
 			goto end;
@@ -255,7 +255,7 @@ int loglevel_str_to_value(const char *inputstr)
 	int i = 0;
 	char str[LTTNG_SYMBOL_NAME_LEN];
 
-	while (inputstr[i] != '\0' && i < LTTNG_SYMBOL_NAME_LEN) {
+	while (i < LTTNG_SYMBOL_NAME_LEN && inputstr[i] != '\0') {
 		str[i] = toupper(inputstr[i]);
 		i++;
 	}
@@ -319,8 +319,11 @@ static int enable_events(char *session_name)
 	/* Create lttng domain */
 	if (opt_kernel) {
 		dom.type = LTTNG_DOMAIN_KERNEL;
+		dom.buf_type = LTTNG_BUFFER_GLOBAL;
 	} else if (opt_userspace) {
 		dom.type = LTTNG_DOMAIN_UST;
+		/* Default. */
+		dom.buf_type = LTTNG_BUFFER_PER_PID;
 	} else {
 		ERR("Please specify a tracer (-k/--kernel or -u/--userspace)");
 		ret = CMD_ERROR;