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

Use size_t as type for buffer length in Process

This commit is contained in:
Christian Göttsche 2020-11-24 18:37:13 +01:00 committed by Benny Baumann
parent e1ce141bc3
commit 77ec86aff4
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Process.c
View File

@ -223,7 +223,7 @@ static inline void Process_writeCommand(const Process* this, int attr, int basea
}
}
void Process_outputRate(RichString* str, char* buffer, int n, double rate, int coloring) {
void Process_outputRate(RichString* str, char* buffer, size_t n, double rate, int coloring) {
int largeNumberColor = CRT_colors[LARGE_NUMBER];
int processMegabytesColor = CRT_colors[PROCESS_MEGABYTES];
int processColor = CRT_colors[PROCESS];
@ -258,7 +258,7 @@ void Process_writeField(const Process* this, RichString* str, ProcessField field
char buffer[256]; buffer[255] = '\0';
int attr = CRT_colors[DEFAULT_COLOR];
int baseattr = CRT_colors[PROCESS_BASENAME];
int n = sizeof(buffer) - 1;
size_t n = sizeof(buffer) - 1;
bool coloring = this->settings->highlightMegabytes;
switch (field) {
@ -312,7 +312,7 @@ void Process_writeField(const Process* this, RichString* str, ProcessField field
} else {
ret = snprintf(buf, n, " ");
}
if (ret < 0 || ret >= n) {
if (ret < 0 || (size_t)ret >= n) {
written = n;
} else {
written = ret;

2
Process.h
View File

@ -176,7 +176,7 @@ void Process_printTime(RichString* str, unsigned long long totalHundredths);
void Process_fillStarttimeBuffer(Process* this);
void Process_outputRate(RichString* str, char* buffer, int n, double rate, int coloring);
void Process_outputRate(RichString* str, char* buffer, size_t n, double rate, int coloring);
void Process_display(const Object* cast, RichString* out);

2
linux/LinuxProcess.c
View File

@ -618,7 +618,7 @@ static void LinuxProcess_writeField(const Process* this, RichString* str, Proces
bool coloring = this->settings->highlightMegabytes;
char buffer[256]; buffer[255] = '\0';
int attr = CRT_colors[DEFAULT_COLOR];
int n = sizeof(buffer) - 1;
size_t n = sizeof(buffer) - 1;
switch ((int)field) {
case TTY_NR: {
if (lp->ttyDevice) {