From: Timo Sirainen Date: Tue, 16 Mar 2021 17:09:06 +0000 (+0200) Subject: lib: Rename event_find_field*() to event_find_field_recursive*() X-Git-Tag: 2.3.16~318 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07437af0e549a39ca5f6235cb2eb8dc7da0af397;p=thirdparty%2Fdovecot%2Fcore.git lib: Rename event_find_field*() to event_find_field_recursive*() This clarifies how it works. --- diff --git a/src/auth/test-auth-request-fields.c b/src/auth/test-auth-request-fields.c index ad4d3da07d..e43a1bf0f3 100644 --- a/src/auth/test-auth-request-fields.c +++ b/src/auth/test-auth-request-fields.c @@ -88,7 +88,7 @@ static void test_auth_request_fields_list(void) if (test->event_field != NULL) { const char *value = - event_find_field_str(request->event, test->event_field); + event_find_field_recursive_str(request->event, test->event_field); test_assert_idx(null_strcmp(value, test->value) == 0, i); } } @@ -126,15 +126,15 @@ static void test_auth_request_fields_secured(void) test_assert(auth_request_import(request, "secured", "")); test_assert(test_auth_request_export_cmp(request, "secured", "")); - test_assert(null_strcmp(event_find_field_str(request->event, "transport"), "trusted") == 0); + test_assert(null_strcmp(event_find_field_recursive_str(request->event, "transport"), "trusted") == 0); test_assert(auth_request_import(request, "secured", "tls")); test_assert(test_auth_request_export_cmp(request, "secured", "tls")); - test_assert(null_strcmp(event_find_field_str(request->event, "transport"), "TLS") == 0); + test_assert(null_strcmp(event_find_field_recursive_str(request->event, "transport"), "TLS") == 0); test_assert(auth_request_import(request, "secured", "blah")); test_assert(test_auth_request_export_cmp(request, "secured", "")); - test_assert(null_strcmp(event_find_field_str(request->event, "transport"), "trusted") == 0); + test_assert(null_strcmp(event_find_field_recursive_str(request->event, "transport"), "trusted") == 0); test_auth_request_deinit(request); } diff --git a/src/lib-dict/dict.c b/src/lib-dict/dict.c index b1d40a17b6..2682af099b 100644 --- a/src/lib-dict/dict.c +++ b/src/lib-dict/dict.c @@ -219,7 +219,7 @@ void dict_post_api_callback(struct dict *dict) static void dict_lookup_finished(struct event *event, int ret, const char *error) { i_assert(ret >= 0 || error != NULL); - const char *key = event_find_field_str(event, "key"); + const char *key = event_find_field_recursive_str(event, "key"); if (ret < 0) event_add_str(event, "error", error); else if (ret == 0) diff --git a/src/lib/event-filter.c b/src/lib/event-filter.c index 434f7c85cf..f04b082200 100644 --- a/src/lib/event-filter.c +++ b/src/lib/event-filter.c @@ -525,7 +525,7 @@ event_match_field(struct event *event, const struct event_field *wanted_field, const struct event_field *field; /* wanted_field has the value in all available formats */ - field = event_find_field(event, wanted_field->key); + field = event_find_field_recursive(event, wanted_field->key); if (field == NULL) { /* field="" matches nonexistent field */ return wanted_field->value.str[0] == '\0'; diff --git a/src/lib/lib-event.c b/src/lib/lib-event.c index 8f214810b6..cd716f88f0 100644 --- a/src/lib/lib-event.c +++ b/src/lib/lib-event.c @@ -98,7 +98,7 @@ event_find_category(const struct event *event, const struct event_category *category); static struct event_field * -event_find_field_int(const struct event *event, const char *key); +event_find_field(const struct event *event, const char *key); static void event_set_changed(struct event *event) { @@ -194,7 +194,7 @@ bool event_has_all_fields(struct event *event, const struct event *other) if (!array_is_created(&other->fields)) return TRUE; array_foreach_modifiable(&other->fields, fld) { - if (event_find_field_int(event, fld->key) == NULL) + if (event_find_field(event, fld->key) == NULL) return FALSE; } return TRUE; @@ -793,7 +793,7 @@ event_add_category(struct event *event, struct event_category *category) } static struct event_field * -event_find_field_int(const struct event *event, const char *key) +event_find_field(const struct event *event, const char *key) { struct event_field *field; @@ -808,12 +808,12 @@ event_find_field_int(const struct event *event, const char *key) } const struct event_field * -event_find_field(const struct event *event, const char *key) +event_find_field_recursive(const struct event *event, const char *key) { const struct event_field *field; do { - if ((field = event_find_field_int(event, key)) != NULL) + if ((field = event_find_field(event, key)) != NULL) return field; event = event->parent; } while (event != NULL); @@ -821,11 +821,11 @@ event_find_field(const struct event *event, const char *key) } const char * -event_find_field_str(const struct event *event, const char *key) +event_find_field_recursive_str(const struct event *event, const char *key) { const struct event_field *field; - field = event_find_field(event, key); + field = event_find_field_recursive(event, key); if (field == NULL) return NULL; @@ -847,7 +847,7 @@ event_get_field(struct event *event, const char *key) { struct event_field *field; - field = event_find_field_int(event, key); + field = event_find_field(event, key); if (field == NULL) { if (!array_is_created(&event->fields)) p_array_init(&event->fields, event->pool, 8); @@ -892,7 +892,7 @@ event_inc_int(struct event *event, const char *key, intmax_t num) { struct event_field *field; - field = event_find_field_int(event, key); + field = event_find_field(event, key); if (field == NULL || field->value_type != EVENT_FIELD_VALUE_TYPE_INTMAX) return event_add_int(event, key, num); diff --git a/src/lib/lib-event.h b/src/lib/lib-event.h index 2c6ab2bbcf..4d6f8750cd 100644 --- a/src/lib/lib-event.h +++ b/src/lib/lib-event.h @@ -301,12 +301,12 @@ void event_get_last_duration(const struct event *event, /* Returns field for a given key, or NULL if it doesn't exist. If the key isn't found from the event itself, find it from parent events. */ const struct event_field * -event_find_field(const struct event *event, const char *key); +event_find_field_recursive(const struct event *event, const char *key); /* Returns the given key's value as string, or NULL if it doesn't exist. If the field isn't stored as a string, the result is allocated from data stack. */ const char * -event_find_field_str(const struct event *event, const char *key); +event_find_field_recursive_str(const struct event *event, const char *key); /* Returns all key=value fields that the event has. Parent events' fields aren't returned. */ const struct event_field * diff --git a/src/lib/test-event-filter-expr.c b/src/lib/test-event-filter-expr.c index 7ed2f55dfd..0af8a982eb 100644 --- a/src/lib/test-event-filter-expr.c +++ b/src/lib/test-event-filter-expr.c @@ -41,8 +41,8 @@ static void do_test_expr(const char *filter_string, struct event *event, test_begin(t_strdup_printf("%.*s log type + event {a=%s, b=%s} + filter '%s' (exp %s)", 3, /* truncate the type name to avoid CI seeing 'warning' messages */ event_filter_category_from_log_type(log_type), - event_find_field_str(event, "a"), - event_find_field_str(event, "b"), + event_find_field_recursive_str(event, "a"), + event_find_field_recursive_str(event, "b"), filter_string, expected ? "true" : "false")); diff --git a/src/lib/test-event-filter.c b/src/lib/test-event-filter.c index cbaccccb5e..3a3b6e4d22 100644 --- a/src/lib/test-event-filter.c +++ b/src/lib/test-event-filter.c @@ -140,13 +140,13 @@ static void test_event_filter_inc_int(void) filter = event_filter_create(); event_filter_add(filter, &query); - const struct event_field *f = event_find_field(root, "int"); + const struct event_field *f = event_find_field_recursive(root, "int"); i_assert(f == NULL); test_assert(!event_filter_match(filter, root, &failure_ctx)); event_inc_int(root, "int", 7); test_assert(!event_filter_match(filter, root, &failure_ctx)); - f = event_find_field(root, "int"); + f = event_find_field_recursive(root, "int"); i_assert(f != NULL); test_assert_strcmp(f->key, "int"); test_assert(f->value_type == EVENT_FIELD_VALUE_TYPE_INTMAX); @@ -154,7 +154,7 @@ static void test_event_filter_inc_int(void) event_inc_int(root, "int", 7); test_assert(event_filter_match(filter, root, &failure_ctx)); - f = event_find_field(root, "int"); + f = event_find_field_recursive(root, "int"); i_assert(f != NULL); test_assert_strcmp(f->key, "int"); test_assert(f->value_type == EVENT_FIELD_VALUE_TYPE_INTMAX); diff --git a/src/stats/event-exporter-fmt-json.c b/src/stats/event-exporter-fmt-json.c index ce98911a81..4d1f107165 100644 --- a/src/stats/event-exporter-fmt-json.c +++ b/src/stats/event-exporter-fmt-json.c @@ -150,7 +150,7 @@ static void json_export_fields(string_t *dest, struct event *event, const char *name = fields[i].field_key; const struct event_field *field; - field = event_find_field(event, name); + field = event_find_field_recursive(event, name); if (field == NULL) continue; /* doesn't exist, skip it */ diff --git a/src/stats/event-exporter-fmt-tab-text.c b/src/stats/event-exporter-fmt-tab-text.c index 2b8ea01f3d..aab48189fa 100644 --- a/src/stats/event-exporter-fmt-tab-text.c +++ b/src/stats/event-exporter-fmt-tab-text.c @@ -132,7 +132,7 @@ static void tabtext_export_fields(string_t *dest, struct event *event, const char *name = fields[i].field_key; const struct event_field *field; - field = event_find_field(event, name); + field = event_find_field_recursive(event, name); if (field == NULL) continue; /* doesn't exist, skip it */ diff --git a/src/stats/stats-metrics.c b/src/stats/stats-metrics.c index 66f6ecd26d..f4de66dd2f 100644 --- a/src/stats/stats-metrics.c +++ b/src/stats/stats-metrics.c @@ -426,7 +426,8 @@ static void stats_metric_group_by(struct metric *metric, struct event *event, pool_t pool) { const struct stats_metric_settings_group_by *group_by = &metric->group_by[0]; - const struct event_field *field = event_find_field(event, group_by->field); + const struct event_field *field = + event_find_field_recursive(event, group_by->field); struct metric *sub_metric; struct metric_value value; @@ -479,7 +480,8 @@ static void stats_metric_event_field(struct event *event, const char *fieldname, struct stats_dist *stats) { - const struct event_field *field = event_find_field(event, fieldname); + const struct event_field *field = + event_find_field_recursive(event, fieldname); intmax_t num = 0; if (field == NULL)