os-k-team/os-k
os-k-team
/
os-k
2
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into cpu&memory

This commit is contained in:
Adrien Bourmault 2019-03-12 17:47:45 +01:00
parent 8fca2de33f fea5386d6d
commit 85132db7a9
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
kaleid/crtlib/sprintf.c
View File

@ -71,7 +71,7 @@ size_t snprintf(char *str, size_t n, const char *fmt, ...)
} }
// Size of the buffer is for convertions // 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) 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 mod;
char convbuf[CONVBUF] = { 0 }; char convbuf[CONVBUF] = { 0 };
char c; char c, *s;
int d; int d;
uint u; uint u;
char *s;
assert(str && fmt);
if (n == 0) return 0;
// For aesthetic reasons... // For aesthetic reasons...
n--; 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)" // We fallthrough here from the "while (1)"
lflag = hflag = hhflag = altflag = 0;
fmt++; fmt++;
} }