Implement 2-step registration of userspace probe events

[lttng-tools.git] / src / bin / lttng-sessiond / cmd.c

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 7f05655ecd7371a60c6fc3b5b9e1bd9eef768f84..fa7aa82bd540fc1227076f665ff6d24fd27b4b57 100644 (file)
--- 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;
                        }