From c72a4047f867ca0995273a284c38d09c5485c8bc Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Sat, 3 May 2025 13:27:10 +0100 Subject: [PATCH] [Minor] Exclude empty objects --- src/rspamadm/configdump.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/rspamadm/configdump.c b/src/rspamadm/configdump.c index 620a5c42f9..04e1f94ec9 100644 --- a/src/rspamadm/configdump.c +++ b/src/rspamadm/configdump.c @@ -130,14 +130,23 @@ filter_non_default(const ucl_object_t *obj) } if (ucl_object_type(obj) == UCL_OBJECT || ucl_object_type(obj) == UCL_ARRAY) { + bool has_non_default = false; + result = ucl_object_typed_new(ucl_object_type(obj)); while ((cur = ucl_object_iterate(obj, &it, true))) { ucl_object_t *filtered = filter_non_default(cur); if (filtered) { + has_non_default = true; ucl_object_insert_key(result, filtered, ucl_object_key(cur), cur->keylen, true); } } + /* Avoid empty objects */ + if (!has_non_default) { + ucl_object_unref(result); + result = NULL; + } + return result; } -- 2.47.3