michaelh/zephyr
1
0
Fork 0
Code Releases Activity

prf.c: abstract output method call

Browse source 
This makes for nicer code by avoiding repetitions of the same pattern.
Changes to come will make more use of it.

Signed-off-by: Nicolas Pitre <npitre@baylibre.com>
This commit is contained in:
Nicolas Pitre 2019-06-17 22:24:41 -04:00 • committed by Anas Nashif
commit ab59209ea6
1 changed files with 9 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

22
lib/libc/minimal/source/stdout/prf.c
View file

@ -462,16 +462,14 @@ int z_prf(int (*func)(), void *dest, const char *format, va_list vargs)
int width;
VALTYPE val;
#define PUTC(c) do { if ((*func)(c, dest) == EOF) return EOF; } while (false)
count = 0;
while ((c = *format++)) {
if (c != '%') {
if ((*func) (c, dest) == EOF) {
return EOF;
}
PUTC(c);
count++;
} else {
fminus = fplus = fspace = falt = false;
pad = ' '; /* Default pad character */
@ -735,10 +733,7 @@ int z_prf(int (*func)(), void *dest, const char *format, va_list vargs)
break;
case '%':
if ((*func)('%', dest) == EOF) {
return EOF;
}
PUTC('%');
count++;
break;
@ -773,13 +768,14 @@ int z_prf(int (*func)(), void *dest, const char *format, va_list vargs)
c = width;
}
for (cptr = buf; c > 0; c--, cptr++, count++) {
if ((*func)(*cptr, dest) == EOF) {
return EOF;
}
count += c;
for (cptr = buf; c > 0; c--, cptr++) {
PUTC(*cptr);
}
}
}
}
return count;
#undef PUTC
}