zeldon/htop
1
0
Fork 0
mirror of https://github.com/xzeldon/htop.git synced 2024-12-23 22:55:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/hishamhm/htop

Browse Source
This commit is contained in:
Hisham Muhammad 2015-09-11 13:42:04 -03:00
commit 8e81119c33
10 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Header.c
View File

@ -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 {

3
Meter.c
View File

@ -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)

2
Panel.c
View File

@ -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)) {

2
Process.h
View File

@ -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);

2
darwin/DarwinProcess.c
View File

@ -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);

1
darwin/Platform.c
View File

@ -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;

1
darwin/Platform.h
View File

@ -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();

2
freebsd/FreeBSDProcess.c
View File

@ -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;

2
linux/LinuxProcess.c
View File

@ -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;

2
unsupported/UnsupportedProcess.c
View File

@ -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;