From bc523e8949f3f08945316e42845c023c095fd502 Mon Sep 17 00:00:00 2001
From: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Date: Fri, 28 Jun 2024 11:17:43 +0300
Subject: [PATCH] util/debug: update parse_enable_string to deal with +all/-all

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Danylo Piliaiev <dpiliaiev@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29944>
---
 src/util/u_debug.c | 44 +++++++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/src/util/u_debug.c b/src/util/u_debug.c
index 3a5d3a691a8..79934e963c0 100644
--- a/src/util/u_debug.c
+++ b/src/util/u_debug.c
@@ -450,31 +450,33 @@ parse_enable_string(const char *debug,
    uint64_t flag = default_value;
 
    if (debug != NULL) {
-      for (; control->string != NULL; control++) {
-         if (!strcmp(debug, "all")) {
-            flag |= control->flag;
+      const char *s = debug;
+      unsigned n;
 
+      for (; n = strcspn(s, ", "), *s; s += MAX2(1, n)) {
+         bool enable;
+         if (s[0] == '+') {
+            enable = true;
+            s++; n--;
+         } else if (s[0] == '-') {
+            enable = false;
+            s++; n--;
          } else {
-            const char *s = debug;
-            unsigned n;
-
-            for (; n = strcspn(s, ", "), *s; s += MAX2(1, n)) {
-               bool enable;
-               if (s[0] == '+') {
-                  enable = true;
-                  s++; n--;
-               } else if (s[0] == '-') {
-                  enable = false;
-                  s++; n--;
-               } else {
-                  enable = true;
-               }
-               if (strlen(control->string) == n &&
-                   !strncmp(control->string, s, n)) {
+            enable = true;
+         }
+         if (!strncmp(s, "all", 3)) {
+            if (enable)
+               flag = ~0ull;
+            else
+               flag = 0;
+         } else {
+            for (const struct debug_control *c = control; c->string != NULL; c++) {
+               if (strlen(c->string) == n &&
+                   !strncmp(c->string, s, n)) {
                   if (enable)
-                     flag |= control->flag;
+                     flag |= c->flag;
                   else
-                     flag &= ~control->flag;
+                     flag &= ~c->flag;
                }
             }
          }