mirror of https://github.com/xzeldon/htop.git
Use size_t as type for buffer length in Process
This commit is contained in:
parent
e1ce141bc3
commit
77ec86aff4
|
@ -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 largeNumberColor = CRT_colors[LARGE_NUMBER];
|
||||||
int processMegabytesColor = CRT_colors[PROCESS_MEGABYTES];
|
int processMegabytesColor = CRT_colors[PROCESS_MEGABYTES];
|
||||||
int processColor = CRT_colors[PROCESS];
|
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';
|
char buffer[256]; buffer[255] = '\0';
|
||||||
int attr = CRT_colors[DEFAULT_COLOR];
|
int attr = CRT_colors[DEFAULT_COLOR];
|
||||||
int baseattr = CRT_colors[PROCESS_BASENAME];
|
int baseattr = CRT_colors[PROCESS_BASENAME];
|
||||||
int n = sizeof(buffer) - 1;
|
size_t n = sizeof(buffer) - 1;
|
||||||
bool coloring = this->settings->highlightMegabytes;
|
bool coloring = this->settings->highlightMegabytes;
|
||||||
|
|
||||||
switch (field) {
|
switch (field) {
|
||||||
|
@ -312,7 +312,7 @@ void Process_writeField(const Process* this, RichString* str, ProcessField field
|
||||||
} else {
|
} else {
|
||||||
ret = snprintf(buf, n, " ");
|
ret = snprintf(buf, n, " ");
|
||||||
}
|
}
|
||||||
if (ret < 0 || ret >= n) {
|
if (ret < 0 || (size_t)ret >= n) {
|
||||||
written = n;
|
written = n;
|
||||||
} else {
|
} else {
|
||||||
written = ret;
|
written = ret;
|
||||||
|
|
|
@ -176,7 +176,7 @@ void Process_printTime(RichString* str, unsigned long long totalHundredths);
|
||||||
|
|
||||||
void Process_fillStarttimeBuffer(Process* this);
|
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);
|
void Process_display(const Object* cast, RichString* out);
|
||||||
|
|
||||||
|
|
|
@ -618,7 +618,7 @@ static void LinuxProcess_writeField(const Process* this, RichString* str, Proces
|
||||||
bool coloring = this->settings->highlightMegabytes;
|
bool coloring = this->settings->highlightMegabytes;
|
||||||
char buffer[256]; buffer[255] = '\0';
|
char buffer[256]; buffer[255] = '\0';
|
||||||
int attr = CRT_colors[DEFAULT_COLOR];
|
int attr = CRT_colors[DEFAULT_COLOR];
|
||||||
int n = sizeof(buffer) - 1;
|
size_t n = sizeof(buffer) - 1;
|
||||||
switch ((int)field) {
|
switch ((int)field) {
|
||||||
case TTY_NR: {
|
case TTY_NR: {
|
||||||
if (lp->ttyDevice) {
|
if (lp->ttyDevice) {
|
||||||
|
|
Loading…
Reference in New Issue