From 4e2b9f09654ff31602eaa294e0ac77b2f82ea3a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@googlemail.com>
Date: Tue, 25 Aug 2020 12:01:54 +0200
Subject: Avoid shadowing warnings

---
 Action.c                 | 14 +++++++-------
 linux/Battery.c          | 26 +++++++++++++-------------
 linux/LinuxProcessList.c |  6 +++---
 linux/Platform.c         |  8 ++++----
 4 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/Action.c b/Action.c
index 64573938..a7747f52 100644
--- a/Action.c
+++ b/Action.c
@@ -316,17 +316,17 @@ static Htop_Reaction actionSetAffinity(State* st) {
 
    Process* p = (Process*) Panel_getSelected(panel);
    if (!p) return HTOP_OK;
-   Affinity* affinity = Affinity_get(p, st->pl);
-   if (!affinity) return HTOP_OK;
-   Panel* affinityPanel = AffinityPanel_new(st->pl, affinity);
-   Affinity_delete(affinity);
+   Affinity* affinity1 = Affinity_get(p, st->pl);
+   if (!affinity1) return HTOP_OK;
+   Panel* affinityPanel = AffinityPanel_new(st->pl, affinity1);
+   Affinity_delete(affinity1);
 
    void* set = Action_pickFromVector(st, affinityPanel, 15, true);
    if (set) {
-      Affinity* affinity = AffinityPanel_getAffinity(affinityPanel, st->pl);
-      bool ok = MainPanel_foreachProcess((MainPanel*)panel, (MainPanel_ForeachProcessFn) Affinity_set, (Arg){ .v = affinity }, NULL);
+      Affinity* affinity2 = AffinityPanel_getAffinity(affinityPanel, st->pl);
+      bool ok = MainPanel_foreachProcess((MainPanel*)panel, (MainPanel_ForeachProcessFn) Affinity_set, (Arg){ .v = affinity2 }, NULL);
       if (!ok) beep();
-      Affinity_delete(affinity);
+      Affinity_delete(affinity2);
    }
    Panel_delete((Object*)affinityPanel);
 #endif
diff --git a/linux/Battery.c b/linux/Battery.c
index 7a1c8163..4014a500 100644
--- a/linux/Battery.c
+++ b/linux/Battery.c
@@ -64,7 +64,7 @@ static unsigned long int parseBatInfo(const char *fileName, const unsigned short
       }
 
       char* line = NULL;
-      for (unsigned short int i = 0; i < lineNum; i++) {
+      for (unsigned short int j = 0; j < lineNum; j++) {
          free(line);
          line = String_readLine(file);
          if (!line) break;
@@ -194,26 +194,26 @@ static void Battery_getSysData(double* level, ACPresence* isOnAC) {
       const char filePath[50];
 
       xSnprintf((char *) filePath, sizeof filePath, SYS_POWERSUPPLY_DIR "/%s/type", entryName);
-      int fd = open(filePath, O_RDONLY);
-      if (fd == -1)
+      int fd1 = open(filePath, O_RDONLY);
+      if (fd1 == -1)
          continue;
 
       char type[8];
-      ssize_t typelen = xread(fd, type, 7);
-      close(fd);
+      ssize_t typelen = xread(fd1, type, 7);
+      close(fd1);
       if (typelen < 1)
          continue;
 
       if (type[0] == 'B' && type[1] == 'a' && type[2] == 't') {
          xSnprintf((char *) filePath, sizeof filePath, SYS_POWERSUPPLY_DIR "/%s/uevent", entryName);
-         int fd = open(filePath, O_RDONLY);
-         if (fd == -1) {
+         int fd2 = open(filePath, O_RDONLY);
+         if (fd2 == -1) {
             closedir(dir);
             return;
          }
          char buffer[1024];
-         ssize_t buflen = xread(fd, buffer, 1023);
-         close(fd);
+         ssize_t buflen = xread(fd2, buffer, 1023);
+         close(fd2);
          if (buflen < 1) {
             closedir(dir);
             return;
@@ -259,18 +259,18 @@ static void Battery_getSysData(double* level, ACPresence* isOnAC) {
          }
 
          xSnprintf((char *) filePath, sizeof filePath, SYS_POWERSUPPLY_DIR "/%s/online", entryName);
-         int fd = open(filePath, O_RDONLY);
-         if (fd == -1) {
+         int fd3 = open(filePath, O_RDONLY);
+         if (fd3 == -1) {
             closedir(dir);
             return;
          }
          char buffer[2] = "";
          for(;;) {
-            ssize_t res = read(fd, buffer, 1);
+            ssize_t res = read(fd3, buffer, 1);
             if (res == -1 && errno == EINTR) continue;
             break;
          }
-         close(fd);
+         close(fd3);
          if (buffer[0] == '0') {
             *isOnAC = AC_ABSENT;
          } else if (buffer[0] == '1') {
diff --git a/linux/LinuxProcessList.c b/linux/LinuxProcessList.c
index 0d25e365..6d3d0348 100644
--- a/linux/LinuxProcessList.c
+++ b/linux/LinuxProcessList.c
@@ -1227,9 +1227,9 @@ static inline double LinuxProcessList_scanCPUFrequency(LinuxProcessList* this) {
             (sscanf(buffer, "processor: %d", &cpuid) == 1)
          ) {
             if (cpuid < 0 || cpuid > (cpus - 1)) {
-               char buffer[64];
-               xSnprintf(buffer, sizeof(buffer), PROCCPUINFOFILE " contains out-of-range CPU number %d", cpuid);
-               CRT_fatalError(buffer);
+               char tmpbuffer[64];
+               xSnprintf(tmpbuffer, sizeof(tmpbuffer), PROCCPUINFOFILE " contains out-of-range CPU number %d", cpuid);
+               CRT_fatalError(tmpbuffer);
             }
          } else if (
             (sscanf(buffer, "cpu MHz : %lf", &frequency) == 1) ||
diff --git a/linux/Platform.c b/linux/Platform.c
index 10311a2d..0f59fed6 100644
--- a/linux/Platform.c
+++ b/linux/Platform.c
@@ -94,12 +94,12 @@ static Htop_Reaction Platform_actionSetIOPriority(State* st) {
 
    LinuxProcess* p = (LinuxProcess*) Panel_getSelected(panel);
    if (!p) return HTOP_OK;
-   IOPriority ioprio = p->ioPriority;
-   Panel* ioprioPanel = IOPriorityPanel_new(ioprio);
+   IOPriority ioprio1 = p->ioPriority;
+   Panel* ioprioPanel = IOPriorityPanel_new(ioprio1);
    void* set = Action_pickFromVector(st, ioprioPanel, 21, true);
    if (set) {
-      IOPriority ioprio = IOPriorityPanel_getIOPriority(ioprioPanel);
-      bool ok = MainPanel_foreachProcess((MainPanel*)panel, (MainPanel_ForeachProcessFn) LinuxProcess_setIOPriority, (Arg){ .i = ioprio }, NULL);
+      IOPriority ioprio2 = IOPriorityPanel_getIOPriority(ioprioPanel);
+      bool ok = MainPanel_foreachProcess((MainPanel*)panel, (MainPanel_ForeachProcessFn) LinuxProcess_setIOPriority, (Arg){ .i = ioprio2 }, NULL);
       if (!ok)
          beep();
    }
-- 
cgit v1.2.3