Make scope of match macro symmetric

htop-dev · Nov 2, 2020 · 9a16b10 · 9a16b10
1 parent 493217e
commit 9a16b10
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/linux/Battery.c b/linux/Battery.c
@@ -232,9 +232,11 @@ static void Battery_getSysData(double* level, ACPresence* isOnAC) {
          bool now = false;
          int fullSize = 0;
          double capacityLevel = NAN;
+
+         #define match(str,prefix) \
+            (String_startsWith(str,prefix) ? (str) + strlen(prefix) : NULL)
+
          while ((line = strsep(&buf, "\n")) != NULL) {
-   #define match(str,prefix) \
-           (String_startsWith(str,prefix) ? (str) + strlen(prefix) : NULL)
             const char* ps = match(line, "POWER_SUPPLY_");
             if (!ps) {
                continue;
@@ -266,7 +268,9 @@ static void Battery_getSysData(double* level, ACPresence* isOnAC) {
                continue;
             }
          }
-   #undef match
+
+         #undef match
+
          if (!now && full && !isnan(capacityLevel)) {
             totalRemain += (capacityLevel * fullSize);
          }