lib: event filter - Rename EVENT_FILTER_NODE_TYPE_EVENT_NAME to denote wildcard matching

diff --git a/src/lib/event-filter-parser.y b/src/lib/event-filter-parser.y
index c3db39d428f3317f2010ce7300db7dc84dbabd24..03477763a84185532834baf3c0f36738af0edc30 100644 (file)
--- a/src/lib/event-filter-parser.y
+++ b/src/lib/event-filter-parser.y
@@ -34,7 +34,7 @@ static struct event_filter_node *key_value(struct event_filter_parser_state *sta
        enum event_filter_node_type type;
 
        if (strcmp(a, "event") == 0)
-               type = EVENT_FILTER_NODE_TYPE_EVENT_NAME;
+               type = EVENT_FILTER_NODE_TYPE_EVENT_NAME_WILDCARD;
        else if (strcmp(a, "category") == 0)
                type = EVENT_FILTER_NODE_TYPE_EVENT_CATEGORY;
        else if (strcmp(a, "source_location") == 0)
@@ -56,7 +56,7 @@ static struct event_filter_node *key_value(struct event_filter_parser_state *sta
        switch (type) {
        case EVENT_FILTER_NODE_TYPE_LOGIC:
                i_unreached();
-       case EVENT_FILTER_NODE_TYPE_EVENT_NAME:
+       case EVENT_FILTER_NODE_TYPE_EVENT_NAME_WILDCARD:
                node->str = p_strdup(state->pool, b);
                state->has_event_name = TRUE;
                break;

diff --git a/src/lib/event-filter-private.h b/src/lib/event-filter-private.h
index 6793124c672f772105392152b016fbe695e55e91..632ae46ca74f443adc60fffd37521c4508ca7a49 100644 (file)
--- a/src/lib/event-filter-private.h
+++ b/src/lib/event-filter-private.h
@@ -20,7 +20,7 @@ enum event_filter_node_type {
        EVENT_FILTER_NODE_TYPE_LOGIC = 1, /* children */
 
        /* leaf nodes */
-       EVENT_FILTER_NODE_TYPE_EVENT_NAME, /* str */
+       EVENT_FILTER_NODE_TYPE_EVENT_NAME_WILDCARD, /* str */
        EVENT_FILTER_NODE_TYPE_EVENT_SOURCE_LOCATION, /* str + int */
        EVENT_FILTER_NODE_TYPE_EVENT_CATEGORY, /* cat */
        EVENT_FILTER_NODE_TYPE_EVENT_FIELD, /* field */

diff --git a/src/lib/event-filter.c b/src/lib/event-filter.c
index 707c6b08f18efcaaa43e901f311d904a6a746ca6..315aa0f397ba7c0d3710744cefa03aca66e18466 100644 (file)
--- a/src/lib/event-filter.c
+++ b/src/lib/event-filter.c
@@ -287,7 +287,7 @@ void event_filter_add(struct event_filter *filter,
                struct event_filter_node *node;
 
                node = p_new(filter->pool, struct event_filter_node, 1);
-               node->type = EVENT_FILTER_NODE_TYPE_EVENT_NAME;
+               node->type = EVENT_FILTER_NODE_TYPE_EVENT_NAME_WILDCARD;
                node->op = EVENT_FILTER_OP_CMP_EQ;
                node->str = p_strdup(filter->pool, query->name);
 
@@ -435,7 +435,7 @@ event_filter_export_query_expr(const struct event_filter_query_internal *query,
                }
                str_append_c(dest, ')');
                break;
-       case EVENT_FILTER_NODE_TYPE_EVENT_NAME:
+       case EVENT_FILTER_NODE_TYPE_EVENT_NAME_WILDCARD:
                str_append(dest, "event");
                str_append(dest, event_filter_export_query_expr_op(node->op));
                str_append_c(dest, '"');
@@ -631,7 +631,7 @@ event_filter_query_match_cmp(struct event_filter_node *node,
        switch (node->type) {
                case EVENT_FILTER_NODE_TYPE_LOGIC:
                        i_unreached();
-               case EVENT_FILTER_NODE_TYPE_EVENT_NAME:
+               case EVENT_FILTER_NODE_TYPE_EVENT_NAME_WILDCARD:
                        return (event->sending_name != NULL) &&
                               wildcard_match(event->sending_name, node->str);
                case EVENT_FILTER_NODE_TYPE_EVENT_SOURCE_LOCATION:
@@ -806,7 +806,7 @@ event_filter_query_update_category(struct event_filter_query_internal *query,
                event_filter_query_update_category(query, node->children[0], category, add);
                event_filter_query_update_category(query, node->children[1], category, add);
                break;
-       case EVENT_FILTER_NODE_TYPE_EVENT_NAME:
+       case EVENT_FILTER_NODE_TYPE_EVENT_NAME_WILDCARD:
        case EVENT_FILTER_NODE_TYPE_EVENT_SOURCE_LOCATION:
        case EVENT_FILTER_NODE_TYPE_EVENT_FIELD:
                break;