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 len type for xSnprintf 

Like the C snprintf function
This commit is contained in:
Christian Göttsche 2020-11-24 18:14:56 +01:00 committed by Benny Baumann
parent 3d15ba5197
commit d9224c66a4
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
XUtils.c
View File

@ -184,13 +184,13 @@ int xAsprintf(char** strp, const char* fmt, ...) {
return r; return r;
} }
int xSnprintf(char* buf, int len, const char* fmt, ...) { int xSnprintf(char* buf, size_t len, const char* fmt, ...) {
va_list vl; va_list vl;
va_start(vl, fmt); va_start(vl, fmt);
int n = vsnprintf(buf, len, fmt, vl); int n = vsnprintf(buf, len, fmt, vl);
va_end(vl); va_end(vl);
if (n < 0 || n >= len) { if (n < 0 || (size_t)n >= len) {
fail(); fail();
} }

2
XUtils.h
View File

@ -59,7 +59,7 @@ ATTR_FORMAT(printf, 2, 3)
int xAsprintf(char** strp, const char* fmt, ...); int xAsprintf(char** strp, const char* fmt, ...);
ATTR_FORMAT(printf, 3, 4) ATTR_FORMAT(printf, 3, 4)
int xSnprintf(char* buf, int len, const char* fmt, ...); int xSnprintf(char* buf, size_t len, const char* fmt, ...);
char* xStrdup(const char* str) ATTR_NONNULL; char* xStrdup(const char* str) ATTR_NONNULL;