X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=61a762803668af2ffbbc330303b5034010bc6b87;hb=8005f29ac9f079b844b3e6bb0261e19a76ccd4da;hp=2aa93e63e915d8e0b03357f815ad7c3f3d13f766;hpb=ed7f40833d26f9d757c455607118c6d8e866a956;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 2aa93e63e..61a762803 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -2032,14 +2032,16 @@ static int list_lttng_ust_global_events(char *channel_name,
 			tmp[i].type = LTTNG_EVENT_FUNCTION;
 			break;
 		}
-		strncpy(tmp[i].loglevel, uevent->attr.loglevel, LTTNG_SYMBOL_NAME_LEN);
-		tmp[i].loglevel[LTTNG_SYMBOL_NAME_LEN - 1] = '\0';
+		tmp[i].loglevel = uevent->attr.loglevel;
 		switch (uevent->attr.loglevel_type) {
-		case LTTNG_UST_LOGLEVEL:
-			tmp[i].type = LTTNG_EVENT_LOGLEVEL;
+		case LTTNG_UST_LOGLEVEL_ALL:
+			tmp[i].type = LTTNG_EVENT_LOGLEVEL_ALL;
 			break;
-		case LTTNG_UST_LOGLEVEL_ONLY:
-			tmp[i].type = LTTNG_EVENT_LOGLEVEL_ONLY;
+		case LTTNG_UST_LOGLEVEL_RANGE:
+			tmp[i].type = LTTNG_EVENT_LOGLEVEL_RANGE;
+			break;
+		case LTTNG_UST_LOGLEVEL_SINGLE:
+			tmp[i].type = LTTNG_EVENT_LOGLEVEL_SINGLE;
 			break;
 		}
 		i++;
@@ -3302,7 +3304,6 @@ static int process_client_msg(struct command_ctx *cmd_ctx)
 		ret = cmd_disable_event(cmd_ctx->session, cmd_ctx->lsm->domain.type,
 				cmd_ctx->lsm->u.disable.channel_name,
 				cmd_ctx->lsm->u.disable.name);
-		ret = LTTCOMM_OK;
 		break;
 	}
 	case LTTNG_DISABLE_ALL_EVENT: