mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 17:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

dboxinfo: remove impossible case

Browse Source 
The kernel does (and has always) report memory in
kib units, so there is no need to check this.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 75e14b90e5
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-05 (Sun, 05 Jan 2014)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2014-01-05 18:53:23 +01:00
committed by vanhofen
parent e6532a8b4f
commit eb201a8975
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/dboxinfo.cpp
View File

@@ -227,11 +227,7 @@ void CDBoxInfoWidget::paint()
char buf[80], a[80]; char buf[80], a[80];
long long unsigned v; long long unsigned v;
while (fgets(buf, sizeof(buf), procmeminfo)) { while (fgets(buf, sizeof(buf), procmeminfo)) {
char unit[10]; if (2 == sscanf(buf, "%[^:]: %llu", a, &v)) {
*unit = 0;
if ((3 == sscanf(buf, "%[^:]: %llu %s", a, &v, unit))
|| (2 == sscanf(buf, "%[^:]: %llu", a, &v))) {
if (*unit == 'k')
v <<= 10; v <<= 10;
if (!strcasecmp(a, "MemTotal")) if (!strcasecmp(a, "MemTotal"))
memstat[MEMINFO_RAM][MEMINFO_TOTAL] += v; memstat[MEMINFO_RAM][MEMINFO_TOTAL] += v;