From: Kevin Day <kevin@kevux.org>
Date: Sun, 2 Apr 2023 22:45:11 +0000 (-0500)
Subject: Bugfix: Remove extra arguments being added.
X-Git-Tag: 0.6.5~18
X-Git-Url: https://git.kevux.org/?a=commitdiff_plain;h=e8998b2e7976cee50c8e0db55ed19e2137d7aa12;p=fll

Bugfix: Remove extra arguments being added.

The parameter expansion is perhaps the worst designed area of the Featureless Make project.
It went through a lot of iterations and the logic requires jumping around too much.

At some point I changed the code to fix problems with the expansion logic regarding quotes and not quotes.
Two functions were left that still added arguments of their own.
This seems wrong.
This does not appear to cause an obvious bug and so it is also unclear if removing these cause a non-obvious regression.
Keep an eye out for regressions in this.
---

diff --git a/level_3/fake/c/private-make-operate.c b/level_3/fake/c/private-make-operate.c
index dc80292..5eec7cf 100644
--- a/level_3/fake/c/private-make-operate.c
+++ b/level_3/fake/c/private-make-operate.c
@@ -1146,12 +1146,6 @@ extern "C" {
 
     status = f_string_dynamic_append_nulless(data_make->cache_1, &data_make->cache_arguments.array[data_make->cache_arguments.used]);
 
-    if (F_status_is_error_not(status) && !quote) {
-      ++data_make->cache_arguments.used;
-
-      status = f_string_dynamics_increase(fake_default_allocation_small_d, &data_make->cache_arguments);
-    }
-
     if (F_status_is_error(status)) return status;
     if (data_make->cache_1.used) return F_true;
 
@@ -1235,14 +1229,6 @@ extern "C" {
     }
 
     if (F_status_is_error(status)) return status;
-
-    if (!quote) {
-      ++data_make->cache_arguments.used;
-
-      status = f_string_dynamics_increase(fake_default_allocation_small_d, &data_make->cache_arguments);
-      if (F_status_is_error(status)) return status;
-    }
-
     if (data_make->cache_2.used) return F_true;
 
     return F_data_not;