Merge branch 'master' into cpu&memory

This commit is contained in:
Adrien Bourmault 2019-03-12 17:47:45 +01:00
commit 85132db7a9
1 changed files with 9 additions and 5 deletions

View File

@ -71,7 +71,7 @@ size_t snprintf(char *str, size_t n, const char *fmt, ...)
}
// Size of the buffer is for convertions
#define CONVBUF 4096
#define CONVBUF 64
size_t vsnprintf(char *str, size_t n, const char *fmt, va_list ap)
{
@ -82,10 +82,13 @@ size_t vsnprintf(char *str, size_t n, const char *fmt, va_list ap)
char mod;
char convbuf[CONVBUF] = { 0 };
char c;
int d;
uint u;
char *s;
char c, *s;
int d;
uint u;
assert(str && fmt);
if (n == 0) return 0;
// For aesthetic reasons...
n--;
@ -235,6 +238,7 @@ size_t vsnprintf(char *str, size_t n, const char *fmt, va_list ap)
}
// We fallthrough here from the "while (1)"
lflag = hflag = hhflag = altflag = 0;
fmt++;
}