diff options
| author | Hisham Muhammad <hisham@gobolinux.org> | 2015-02-23 03:34:06 -0300 |
|---|---|---|
| committer | Hisham Muhammad <hisham@gobolinux.org> | 2015-02-23 03:34:06 -0300 |
| commit | 50000d808e23a80b8e3ec26b46062c419edff6d4 (patch) | |
| tree | c87415cdc2a4f904fc90f30b7f4822a068addfb6 /linux | |
| parent | 5ca9b8e00266a4a3513143b91b87a616caee8f1c (diff) | |
Silence warnings reported in #70.
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/Battery.c | 3 | ||||
| -rw-r--r-- | linux/LinuxProcessList.c | 5 | ||||
| -rw-r--r-- | linux/Platform.c | 5 |
3 files changed, 8 insertions, 5 deletions
diff --git a/linux/Battery.c b/linux/Battery.c index f766098f..532c118b 100644 --- a/linux/Battery.c +++ b/linux/Battery.c @@ -117,7 +117,8 @@ static ACPresence procAcpiCheck() { } char line[100]; - fgets(line, sizeof line, file); + char* ok = fgets(line, sizeof line, file); + if (!ok) continue; line[sizeof(line) - 1] = '\0'; fclose(file); diff --git a/linux/LinuxProcessList.c b/linux/LinuxProcessList.c index 2bb207ee..2435b120 100644 --- a/linux/LinuxProcessList.c +++ b/linux/LinuxProcessList.c @@ -344,7 +344,7 @@ static void LinuxProcessList_readOpenVZData(ProcessList* this, Process* process, FILE* file = fopen(filename, "r"); if (!file) return; - fscanf(file, + (void) fscanf(file, "%*32u %*32s %*1c %*32u %*32u %*32u %*32u %*32u %*32u %*32u " "%*32u %*32u %*32u %*32u %*32u %*32u %*32u %*32u " "%*32u %*32u %*32u %*32u %*32u %*32u %*32u %*32u " @@ -692,7 +692,8 @@ static inline double LinuxProcessList_scanCPUTime(LinuxProcessList* this) { // Dependending on your kernel version, // 5, 7, 8 or 9 of these fields will be set. // The rest will remain at zero. - fgets(buffer, 255, file); + char* ok = fgets(buffer, 255, file); + if (!ok) buffer[0] = '\0'; if (i == 0) sscanf(buffer, "cpu %16llu %16llu %16llu %16llu %16llu %16llu %16llu %16llu %16llu %16llu", &usertime, &nicetime, &systemtime, &idletime, &ioWait, &irq, &softIrq, &steal, &guest, &guestnice); else { diff --git a/linux/Platform.c b/linux/Platform.c index 8d3e2976..0d5b2471 100644 --- a/linux/Platform.c +++ b/linux/Platform.c @@ -80,8 +80,9 @@ int Platform_getUptime() { double uptime = 0; FILE* fd = fopen(PROCDIR "/uptime", "r"); if (fd) { - fscanf(fd, "%64lf", &uptime); + int n = fscanf(fd, "%64lf", &uptime); fclose(fd); + if (n <= 0) return 0; } return (int) floor(uptime); } @@ -103,7 +104,7 @@ int Platform_getMaxPid() { FILE* file = fopen(PROCDIR "/sys/kernel/pid_max", "r"); if (!file) return -1; int maxPid = 4194303; - fscanf(file, "%32d", &maxPid); + (void) fscanf(file, "%32d", &maxPid); fclose(file); return maxPid; } |