X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=fa7aa82bd540fc1227076f665ff6d24fd27b4b57;hb=1ab8c2ad460ea71dd6d1580d6b69fb0cf68ce9ad;hp=7f05655ecd7371a60c6fc3b5b9e1bd9eef768f84;hpb=17dd12323bbd9f979e5b3886f979a1e02e2dcbe6;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 7f05655ec..fa7aa82bd 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -712,6 +712,8 @@ static int list_lttng_kernel_events(char *channel_name,
 			(*events)[i].type = LTTNG_EVENT_SYSCALL;
 			break;
 		case LTTNG_KERNEL_ALL:
+			/* fall-through. */
+		default:
 			assert(0);
 			break;
 		}
@@ -2093,8 +2095,7 @@ static int _cmd_enable_event(struct ltt_session *session,
 			ret = validate_ust_event_name(event->name);
 			if (ret) {
 			        WARN("Userspace event name %s failed validation.",
-						event->name ?
-						event->name : "NULL");
+						event->name);
 				ret = LTTNG_ERR_INVALID_EVENT_NAME;
 				goto error;
 			}