From 7891cdc55265a3435bd0d9b4ed7fc5b9b9c937ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@googlemail.com>
Date: Thu, 2 Sep 2021 22:32:40 +0200
Subject: [PATCH] Reduce variable scope

Also avoid declaring variables of different type, pointer and array, in
the same line.
---
 Header.c   | 3 ++-
 Settings.c | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Header.c b/Header.c
index ba7c3aaf..a88a472c 100644
--- a/Header.c
+++ b/Header.c
@@ -86,8 +86,9 @@ static void Header_addMeterByName(Header* this, const char* name, MeterModeId mo
    if (paren) {
       int ok = sscanf(paren, "(%10u)", &param); // CPUMeter
       if (!ok) {
-         char* end, dynamic[32] = {0};
+         char dynamic[32] = {0};
          if (sscanf(paren, "(%30s)", dynamic)) { // DynamicMeter
+            char* end;
             if ((end = strrchr(dynamic, ')')) == NULL)
                return;    // htoprc parse failure
             *end = '\0';
diff --git a/Settings.c b/Settings.c
index 7ef314d0..44e91a47 100644
--- a/Settings.c
+++ b/Settings.c
@@ -134,8 +134,9 @@ static void Settings_readFields(Settings* settings, const char* line) {
       }
 
       // Dynamically-defined columns are always stored by-name.
-      char* end, dynamic[32] = {0};
+      char dynamic[32] = {0};
       if (sscanf(ids[i], "Dynamic(%30s)", dynamic)) {
+         char* end;
          if ((end = strrchr(dynamic, ')')) == NULL)
             continue;
          *end = '\0';