Allow many arguments for the count() function.

1 files changed, 12 insertions, 5 deletions

diff --git a/src/analysis/scan/items/count.c b/src/analysis/scan/items/count.c
index 339c490..1d01867 100644
--- a/src/analysis/scan/items/count.c
+++ b/src/analysis/scan/items/count.c
@@ -225,17 +225,24 @@ static char *g_scan_count_function_get_name(const GScanCountFunction *item)
 static bool g_scan_count_function_run_call(GScanCountFunction *item, GScanExpression **args, size_t count, GScanContext *ctx, GScanScope *scope, GObject **out)
 {
     bool result;                            /* Bilan à retourner           */
+    size_t sum;                             /* Somme des décomptes         */
+    size_t i;                               /* Boucle de parcours          */
     size_t value;                           /* Nouveau décompte            */
 
-    if (count != 1)
-        result = false;
+    result = (count > 0);
 
-    else
+    if (result)
     {
-        result = g_scan_expression_count_items(args[0], ctx, &value);
+        sum = 0;
+
+        for (i = 0; i < count && result; i++)
+        {
+            result = g_scan_expression_count_items(args[i], ctx, &value);
+            sum += value;
+        }
 
         if (result)
-            *out = G_OBJECT(g_scan_literal_expression_new(LVT_UNSIGNED_INTEGER, (unsigned long long []){ value }));
+            *out = G_OBJECT(g_scan_literal_expression_new(LVT_UNSIGNED_INTEGER, (unsigned long long []){ sum }));
 
     }