X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=liblttng-ust%2Flttng-events.c;h=527aa69ce4cc256defe582b971e5ea79ceb9f4b3;hb=e450e3396b0bfe998e3bde6aef7dc3b4232f8edb;hp=d1beac3a6d027154e5d40acd696a0d1cfcb6cf14;hpb=b77aaa1b8edf2c1b1742a8b0c92714a8e9d00351;p=deliverable%2Flttng-ust.git

diff --git a/liblttng-ust/lttng-events.c b/liblttng-ust/lttng-events.c
index d1beac3a..527aa69c 100644
--- a/liblttng-ust/lttng-events.c
+++ b/liblttng-ust/lttng-events.c
@@ -631,7 +631,7 @@ int lttng_desc_match_star_glob_enabler(const struct lttng_event_desc *desc,
 	int loglevel = 0;
 	unsigned int has_loglevel = 0;
 
-	assert(enabler->type == LTTNG_ENABLER_STAR_GLOB);
+	assert(enabler->format_type == LTTNG_ENABLER_FORMAT_STAR_GLOB);
 	if (!strutils_star_glob_match(enabler->event_param.name, SIZE_MAX,
 			desc->name, SIZE_MAX))
 		return 0;
@@ -654,7 +654,7 @@ int lttng_desc_match_event_enabler(const struct lttng_event_desc *desc,
 	int loglevel = 0;
 	unsigned int has_loglevel = 0;
 
-	assert(enabler->type == LTTNG_ENABLER_EVENT);
+	assert(enabler->format_type == LTTNG_ENABLER_FORMAT_EVENT);
 	if (strcmp(desc->name, enabler->event_param.name))
 		return 0;
 	if (desc->loglevel) {
@@ -673,8 +673,8 @@ static
 int lttng_desc_match_enabler(const struct lttng_event_desc *desc,
 		struct lttng_enabler *enabler)
 {
-	switch (enabler->type) {
-	case LTTNG_ENABLER_STAR_GLOB:
+	switch (enabler->format_type) {
+	case LTTNG_ENABLER_FORMAT_STAR_GLOB:
 	{
 		struct lttng_ust_excluder_node *excluder;
 
@@ -702,7 +702,7 @@ int lttng_desc_match_enabler(const struct lttng_event_desc *desc,
 		}
 		return 1;
 	}
-	case LTTNG_ENABLER_EVENT:
+	case LTTNG_ENABLER_FORMAT_EVENT:
 		return lttng_desc_match_event_enabler(desc, enabler);
 	default:
 		return -EINVAL;
@@ -1041,7 +1041,7 @@ void lttng_ust_events_exit(void)
 /*
  * Enabler management.
  */
-struct lttng_enabler *lttng_enabler_create(enum lttng_enabler_type type,
+struct lttng_enabler *lttng_enabler_create(enum lttng_enabler_format_type format_type,
 		struct lttng_ust_event *event_param,
 		struct lttng_channel *chan)
 {
@@ -1050,7 +1050,7 @@ struct lttng_enabler *lttng_enabler_create(enum lttng_enabler_type type,
 	enabler = zmalloc(sizeof(*enabler));
 	if (!enabler)
 		return NULL;
-	enabler->type = type;
+	enabler->format_type = format_type;
 	CDS_INIT_LIST_HEAD(&enabler->filter_bytecode_head);
 	CDS_INIT_LIST_HEAD(&enabler->excluder_head);
 	memcpy(&enabler->event_param, event_param,