From f205f7004c2530a499175ad240e0d83e484a0961 Mon Sep 17 00:00:00 2001 From: Hisham Muhammad Date: Wed, 26 Jul 2017 15:35:39 -0300 Subject: Use regular readdir since readdir_r is deprecated and newer GCC complains. --- linux/Battery.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/linux/Battery.c b/linux/Battery.c index 4bee340b..e575b307 100644 --- a/linux/Battery.c +++ b/linux/Battery.c @@ -41,11 +41,9 @@ static unsigned long int parseBatInfo(const char *fileName, const unsigned short unsigned int nBatteries = 0; memset(batteries, 0, MAX_BATTERIES * sizeof(char*)); - struct dirent result; - struct dirent* dirEntry; while (nBatteries < MAX_BATTERIES) { - int err = readdir_r(batteryDir, &result, &dirEntry); - if (err || !dirEntry) + struct dirent* dirEntry = readdir(batteryDir); + if (!dirEntry) break; char* entryName = dirEntry->d_name; if (strncmp(entryName, "BAT", 3)) @@ -97,11 +95,9 @@ static ACPresence procAcpiCheck() { return AC_ERROR; } - struct dirent result; - struct dirent* dirEntry; for (;;) { - int err = readdir_r((DIR *) dir, &result, &dirEntry); - if (err || !dirEntry) + struct dirent* dirEntry = readdir((DIR *) dir); + if (!dirEntry) break; char* entryName = (char *) dirEntry->d_name; @@ -191,11 +187,9 @@ static void Battery_getSysData(double* level, ACPresence* isOnAC) { unsigned long int totalFull = 0; unsigned long int totalRemain = 0; - struct dirent result; - struct dirent* dirEntry; for (;;) { - int err = readdir_r((DIR *) dir, &result, &dirEntry); - if (err || !dirEntry) + struct dirent* dirEntry = readdir((DIR *) dir); + if (!dirEntry) break; char* entryName = (char *) dirEntry->d_name; const char filePath[50]; -- cgit v1.2.3