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

This commit is contained in:
Daniel Lange 2020-10-20 22:41:24 +02:00
commit f8bd5acdc1
2 changed files with 2 additions and 2 deletions

View File

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

View File

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