X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=lttng-events.c;h=95a79cf75dc10de27daf335b927043f9231bfa29;hb=dbfc656f7bcbe0333d65536f0d7f3e52b6f24e74;hp=d00701466a5d47c532cf3d32c20368d19eda9527;hpb=1e36732678d7cc650940b4508031acf2f6ffcd1b;p=lttng-modules.git

diff --git a/lttng-events.c b/lttng-events.c
index d0070146..95a79cf7 100644
--- a/lttng-events.c
+++ b/lttng-events.c
@@ -51,6 +51,7 @@
 #include <lttng-tracer.h>
 #include <lttng-abi-old.h>
 #include <lttng-endian.h>
+#include <lttng-string-utils.h>
 #include <wrapper/vzalloc.h>
 #include <wrapper/ringbuffer/backend.h>
 #include <wrapper/ringbuffer/frontend.h>
@@ -1142,11 +1143,10 @@ fd_error:
  * Enabler management.
  */
 static
-int lttng_match_enabler_wildcard(const char *desc_name,
-		const char *name)
+int lttng_match_enabler_star_glob(const char *desc_name,
+		const char *pattern)
 {
-	/* Compare excluding final '*' */
-	if (strncmp(desc_name, name, strlen(name) - 1))
+	if (!strutils_star_glob_match(pattern, SIZE_MAX, desc_name, SIZE_MAX))
 		return 0;
 	return 1;
 }
@@ -1191,8 +1191,8 @@ int lttng_desc_match_enabler(const struct lttng_event_desc *desc,
 		return -EINVAL;
 	}
 	switch (enabler->type) {
-	case LTTNG_ENABLER_WILDCARD:
-		return lttng_match_enabler_wildcard(desc_name, enabler_name);
+	case LTTNG_ENABLER_STAR_GLOB:
+		return lttng_match_enabler_star_glob(desc_name, enabler_name);
 	case LTTNG_ENABLER_NAME:
 		return lttng_match_enabler_name(desc_name, enabler_name);
 	default: