filterx: use common function for evaluating expr lists

Signed-off-by: Balazs Scheidler <[email protected]>

lib/filterx/expr-condition.c

@@ -65,17 +65,10 @@ _eval_condition(FilterXConditional *c)
       goto exit;
     }
 
-  for (GList *l = c->statements; l; l = l->next)
+  if (!filterx_expr_list_eval(c->statements, &result))
     {
-      FilterXExpr *expr = l->data;
-      result = filterx_expr_eval(expr);
-      if (!result || !filterx_object_truthy(result))
-        {
-          filterx_object_unref(result);
-          return filterx_boolean_new(FALSE);
-        }
-      if (l->next != NULL)
-        filterx_object_unref(result);
+      filterx_object_unref(result);
+      return filterx_boolean_new(FALSE);
     }
 exit:
   filterx_object_unref(condition_value);

lib/filterx/expr-shorthand.c

@@ -33,19 +33,9 @@ static FilterXObject *
 _eval(FilterXExpr *s)
 {
   FilterXShorthand *self = (FilterXShorthand *) s;
-
   FilterXObject *result = NULL;
-  for (GList *elem = self->exprs; elem; elem = elem->next)
-    {
-      filterx_object_unref(result);
-
-      FilterXExpr *expr = elem->data;
-      result = filterx_expr_eval(expr);
-
-      if (!result || filterx_object_falsy(result))
-        break;
-    }
 
+  filterx_expr_list_eval(self->exprs, &result);
   return result;
 }
 

lib/filterx/filterx-eval.c

@@ -155,7 +155,6 @@ _evaluate_statement(FilterXExpr *expr)
   return success;
 }
 
-
 gboolean
 filterx_eval_exec_statements(FilterXScope *scope, GList *statements, LogMessage *msg)
 {

lib/filterx/filterx-expr.c

@@ -124,3 +124,21 @@ filterx_binary_op_init_instance(FilterXBinaryOp *self, FilterXExpr *lhs, FilterX
   self->lhs = lhs;
   self->rhs = rhs;
 }
+
+gboolean
+filterx_expr_list_eval(GList *expressions, FilterXObject **result)
+{
+  *result = NULL;
+  for (GList *elem = expressions; elem; elem = elem->next)
+    {
+      filterx_object_unref(*result);
+
+      FilterXExpr *expr = elem->data;
+      *result = filterx_expr_eval(expr);
+
+      if (!(*result) || filterx_object_falsy(*result))
+        return FALSE;
+    }
+
+  return TRUE;
+}

lib/filterx/filterx-expr.h

@@ -157,4 +157,6 @@ typedef struct _FilterXBinaryOp
 void filterx_binary_op_free_method(FilterXExpr *s);
 void filterx_binary_op_init_instance(FilterXBinaryOp *self, FilterXExpr *lhs, FilterXExpr *rhs);
 
+gboolean filterx_expr_list_eval(GList *expressions, FilterXObject **result);
+
 #endif