zeldon
/
htop
mirror of https://github.com/xzeldon/htop.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Fix wrong strncmp replacement' of cgzones/htop

This commit is contained in:
Daniel Lange 2020-10-20 22:41:24 +02:00
parent 45a22080c9 e12d48a661
commit f8bd5acdc1
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
linux/Battery.c
View File

@ -53,7 +53,7 @@ static unsigned long int parseBatInfo(const char *fileName, const unsigned short
if (!dirEntry) if (!dirEntry)
break; break;
char* entryName = dirEntry->d_name; char* entryName = dirEntry->d_name;
if (String_startsWith(entryName, "BAT")) if (!String_startsWith(entryName, "BAT"))
continue; continue;
batteries[nBatteries] = xStrdup(entryName); batteries[nBatteries] = xStrdup(entryName);
nBatteries++; nBatteries++;

2
linux/Platform.c
View File

@ -224,7 +224,7 @@ double Platform_setCPUValues(Meter* this, int cpu) {
} }
void Platform_setMemoryValues(Meter* this) { void Platform_setMemoryValues(Meter* this) {
ProcessList* pl = (ProcessList*) this->pl; ProcessList* pl = this->pl;
LinuxProcessList* lpl = (LinuxProcessList*) this->pl; LinuxProcessList* lpl = (LinuxProcessList*) this->pl;
long int usedMem = pl->usedMem; long int usedMem = pl->usedMem;