From 85988467181b491f5ae2ba2463384288c8e45bd4 Mon Sep 17 00:00:00 2001
From: Attila Szakacs <attila.szakacs@axoflow.com>
Date: Thu, 1 Aug 2024 13:19:00 +0200
Subject: [PATCH] filterx: support message_value in subscript and attr key and
 value

Signed-off-by: Attila Szakacs <attila.szakacs@axoflow.com>
---
 lib/filterx/expr-get-subscript.c     | 2 +-
 lib/filterx/expr-literal-generator.c | 4 ++--
 lib/filterx/expr-set-subscript.c     | 4 ++--
 lib/filterx/expr-setattr.c           | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/filterx/expr-get-subscript.c b/lib/filterx/expr-get-subscript.c
index 5ba7453446..69dc2a4df9 100644
--- a/lib/filterx/expr-get-subscript.c
+++ b/lib/filterx/expr-get-subscript.c
@@ -40,7 +40,7 @@ _eval(FilterXExpr *s)
   if (!variable)
     return NULL;
 
-  FilterXObject *key = filterx_expr_eval_typed(self->key);
+  FilterXObject *key = filterx_expr_eval(self->key);
   if (!key)
     goto exit;
   result = filterx_object_get_subscript(variable, key);
diff --git a/lib/filterx/expr-literal-generator.c b/lib/filterx/expr-literal-generator.c
index cee0258c7c..4ac2d66f68 100644
--- a/lib/filterx/expr-literal-generator.c
+++ b/lib/filterx/expr-literal-generator.c
@@ -78,12 +78,12 @@ _eval_elements(FilterXObject *fillable, GList *elements)
       FilterXObject *key = NULL;
       if (elem->key)
         {
-          key = filterx_expr_eval_typed(elem->key);
+          key = filterx_expr_eval(elem->key);
           if (!key)
             return FALSE;
         }
 
-      FilterXObject *value = filterx_expr_eval_typed(elem->value);
+      FilterXObject *value = filterx_expr_eval(elem->value);
       if (!value)
         {
           filterx_object_unref(key);
diff --git a/lib/filterx/expr-set-subscript.c b/lib/filterx/expr-set-subscript.c
index 8c54d082c5..9f6e7149e3 100644
--- a/lib/filterx/expr-set-subscript.c
+++ b/lib/filterx/expr-set-subscript.c
@@ -46,7 +46,7 @@ _eval(FilterXExpr *s)
 
   if (self->key)
     {
-      key = filterx_expr_eval_typed(self->key);
+      key = filterx_expr_eval(self->key);
       if (!key)
         goto exit;
     }
@@ -62,7 +62,7 @@ _eval(FilterXExpr *s)
       goto exit;
     }
 
-  new_value = filterx_expr_eval_typed(self->new_value);
+  new_value = filterx_expr_eval(self->new_value);
   if (!new_value)
     goto exit;
 
diff --git a/lib/filterx/expr-setattr.c b/lib/filterx/expr-setattr.c
index e6af71a274..5745976684 100644
--- a/lib/filterx/expr-setattr.c
+++ b/lib/filterx/expr-setattr.c
@@ -50,7 +50,7 @@ _eval(FilterXExpr *s)
       goto exit;
     }
 
-  FilterXObject *new_value = filterx_expr_eval_typed(self->new_value);
+  FilterXObject *new_value = filterx_expr_eval(self->new_value);
   if (!new_value)
     goto exit;