diff --git a/Header.c b/Header.c index 1d4634f0..e0555c0e 100644 --- a/Header.c +++ b/Header.c @@ -89,7 +89,7 @@ void Header_writeBackToSettings(const Header* this) { for (int i = 0; i < len; i++) { Meter* meter = (Meter*) Vector_get(vec, i); - char* name = calloc(64, sizeof(char*)); + char* name = calloc(64, sizeof(char)); if (meter->param) { snprintf(name, 63, "%s(%d)", As_Meter(meter)->name, meter->param); } else { diff --git a/Meter.c b/Meter.c index ee8fbf78..8792f93d 100644 --- a/Meter.c +++ b/Meter.c @@ -157,6 +157,9 @@ int Meter_humanUnit(char* buffer, unsigned long int value, int size) { ++prefix; } + if (*prefix == 'K') + precision = 0; + for (; precision > 0; precision--) { powj *= 10; if (value / powi < powj) diff --git a/Panel.c b/Panel.c index 65409706..7424fa49 100644 --- a/Panel.c +++ b/Panel.c @@ -455,7 +455,7 @@ bool Panel_onKey(Panel* this, int key) { HandlerResult Panel_selectByTyping(Panel* this, int ch) { int size = Panel_size(this); if (!this->eventHandlerState) - this->eventHandlerState = calloc(100, 1); + this->eventHandlerState = calloc(100, sizeof(char)); char* buffer = this->eventHandlerState; if (ch < 255 && isalnum(ch)) { diff --git a/Process.h b/Process.h index d856c035..841b1291 100644 --- a/Process.h +++ b/Process.h @@ -158,8 +158,6 @@ typedef struct ProcessClass_ { #define ONE_DECIMAL_M (ONE_DECIMAL_K * ONE_DECIMAL_K) #define ONE_DECIMAL_G (ONE_DECIMAL_M * ONE_DECIMAL_K) -extern char Process_pidFormat[20]; - void Process_setupColumnWidths(); void Process_humanNumber(RichString* str, unsigned long number, bool coloring); diff --git a/darwin/DarwinProcess.c b/darwin/DarwinProcess.c index bdaf2874..0b4ec3fe 100644 --- a/darwin/DarwinProcess.c +++ b/darwin/DarwinProcess.c @@ -39,7 +39,7 @@ ProcessClass DarwinProcess_class = { }; DarwinProcess* DarwinProcess_new(Settings* settings) { - DarwinProcess* this = calloc(sizeof(DarwinProcess), 1); + DarwinProcess* this = calloc(1, sizeof(DarwinProcess)); Object_setClass(this, Class(DarwinProcess)); Process_init(&this->super, settings); diff --git a/darwin/Platform.c b/darwin/Platform.c index 2c8ed2cf..c672df0a 100644 --- a/darwin/Platform.c +++ b/darwin/Platform.c @@ -81,7 +81,6 @@ void Platform_setBindings(Htop_Action* keys) { } int Platform_numberOfFields = 100; -char* Process_pidFormat = "%7u "; int Platform_getUptime() { struct timeval bootTime, currTime; diff --git a/darwin/Platform.h b/darwin/Platform.h index f670c7f6..6b3e3d2d 100644 --- a/darwin/Platform.h +++ b/darwin/Platform.h @@ -23,7 +23,6 @@ extern MeterClass* Platform_meterTypes[]; void Platform_setBindings(Htop_Action* keys); extern int Platform_numberOfFields; -extern char* Process_pidFormat; int Platform_getUptime(); diff --git a/freebsd/FreeBSDProcess.c b/freebsd/FreeBSDProcess.c index b5734f81..43fd88d5 100644 --- a/freebsd/FreeBSDProcess.c +++ b/freebsd/FreeBSDProcess.c @@ -86,7 +86,7 @@ ProcessPidColumn Process_pidColumns[] = { }; FreeBSDProcess* FreeBSDProcess_new(Settings* settings) { - FreeBSDProcess* this = calloc(sizeof(FreeBSDProcess), 1); + FreeBSDProcess* this = calloc(1, sizeof(FreeBSDProcess)); Object_setClass(this, Class(FreeBSDProcess)); Process_init(&this->super, settings); return this; diff --git a/linux/LinuxProcess.c b/linux/LinuxProcess.c index fe2f6e18..84c7e38f 100644 --- a/linux/LinuxProcess.c +++ b/linux/LinuxProcess.c @@ -242,7 +242,7 @@ ProcessClass LinuxProcess_class = { }; LinuxProcess* LinuxProcess_new(Settings* settings) { - LinuxProcess* this = calloc(sizeof(LinuxProcess), 1); + LinuxProcess* this = calloc(1, sizeof(LinuxProcess)); Object_setClass(this, Class(LinuxProcess)); Process_init(&this->super, settings); return this; diff --git a/unsupported/UnsupportedProcess.c b/unsupported/UnsupportedProcess.c index 47760a6d..87ac75fd 100644 --- a/unsupported/UnsupportedProcess.c +++ b/unsupported/UnsupportedProcess.c @@ -17,7 +17,7 @@ in the source distribution for its full text. }*/ Process* UnsupportedProcess_new(Settings* settings) { - Process* this = calloc(sizeof(Process), 1); + Process* this = calloc(1, sizeof(Process)); Object_setClass(this, Class(Process)); Process_init(this, settings); return this;