Refactoring/fix: desc match enabler: handle error internally

[lttng-modules.git] / src / lttng-events.c

diff --git a/src/lttng-events.c b/src/lttng-events.c
index c212ff3d6bcff092092a07a9fada60bee748d21c..2abe3ead02ad46f3a4b7ea05f67d78100a705b5b 100644 (file)
--- a/src/lttng-events.c
+++ b/src/lttng-events.c
@@ -1945,7 +1945,8 @@ int lttng_match_enabler_name(const char *desc_name,
        return 1;
 }
 
-int lttng_desc_match_enabler(const struct lttng_kernel_event_desc *desc,
+static
+int lttng_desc_match_enabler_check(const struct lttng_kernel_event_desc *desc,
                struct lttng_event_enabler_common *enabler)
 {
        const char *desc_name, *enabler_name;
@@ -2034,6 +2035,19 @@ int lttng_desc_match_enabler(const struct lttng_kernel_event_desc *desc,
        }
 }
 
+bool lttng_desc_match_enabler(const struct lttng_kernel_event_desc *desc,
+               struct lttng_event_enabler_common *enabler)
+{
+       int ret;
+
+       ret = lttng_desc_match_enabler_check(desc, enabler);
+       if (ret < 0) {
+               WARN_ON_ONCE(1);
+               return false;
+       }
+       return ret;
+}
+
 bool lttng_event_enabler_match_event(struct lttng_event_enabler_common *event_enabler,
                struct lttng_kernel_event_common *event)
 {