filterx: support message_value in subscript and attr key and value

Signed-off-by: Attila Szakacs <[email protected]>
alltilla · Aug 1, 2024 · fae09ec · fae09ec
1 parent d92f754
commit fae09ec
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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;