djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add vprintf, vsnprintf to STM code.

Browse Source
This commit is contained in:
Damien 2013-11-03 18:30:30 +00:00
parent 96a0addb18
commit e8674399f1
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
stm/printf.c
View File

@ -232,9 +232,15 @@ void stdout_print_strn(void *data, const char *str, unsigned int len) {
static const pfenv_t pfenv_stdout = {0, stdout_print_strn}; static const pfenv_t pfenv_stdout = {0, stdout_print_strn};
int printf(const char *fmt, ...) { int printf(const char *fmt, ...) {
va_list args; va_list ap;
va_start(args, fmt); va_start(ap, fmt);
return pfenv_printf(&pfenv_stdout, fmt, args); int ret = pfenv_printf(&pfenv_stdout, fmt, ap);
va_end(ap);
return ret;
}
int vprintf(const char *fmt, va_list ap) {
return pfenv_printf(&pfenv_stdout, fmt, ap);
} }
// need this because gcc optimises printf("%c", c) -> putchar(c), and printf("a") -> putchar('a') // need this because gcc optimises printf("%c", c) -> putchar(c), and printf("a") -> putchar('a')
@ -267,16 +273,14 @@ void strn_print_strn(void *data, const char *str, unsigned int len) {
strn_pfenv->remain -= len; strn_pfenv->remain -= len;
} }
int snprintf(char *str, size_t size, const char *fmt, ...) { int vsnprintf(char *str, size_t size, const char *fmt, va_list ap) {
strn_pfenv_t strn_pfenv; strn_pfenv_t strn_pfenv;
strn_pfenv.cur = str; strn_pfenv.cur = str;
strn_pfenv.remain = size; strn_pfenv.remain = size;
pfenv_t pfenv; pfenv_t pfenv;
pfenv.data = &strn_pfenv; pfenv.data = &strn_pfenv;
pfenv.print_strn = strn_print_strn; pfenv.print_strn = strn_print_strn;
va_list args; int len = pfenv_printf(&pfenv, fmt, ap);
va_start(args, fmt);
int len = pfenv_printf(&pfenv, fmt, args);
// add terminating null byte // add terminating null byte
if (size > 0) { if (size > 0) {
if (strn_pfenv.remain == 0) { if (strn_pfenv.remain == 0) {
@ -287,3 +291,11 @@ int snprintf(char *str, size_t size, const char *fmt, ...) {
} }
return len; return len;
} }
int snprintf(char *str, size_t size, const char *fmt, ...) {
va_list ap;
va_start(ap, fmt);
int ret = vsnprintf(str, size, fmt, ap);
va_end(ap);
return ret;
}