lby/lk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[lib][libc] reduce printf processing slightly

Browse Source 
Have printf always pass the correct string length to its output callback
(which is easy because it's already got this information at hand), and
save downstream code from having to defensively strlen() the string
passed in the callback.
This commit is contained in:
Brian Swetland
2015-07-31 19:21:09 -07:00
parent 50ff81b387
commit c1857484aa
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/debug/debug.c
View File

@@ -162,10 +162,8 @@ FILE __stdio_FILEs[3] = {
static int _dprintf_output_func(const char *str, size_t len, void *state)
{
size_t n = strnlen(str, len);
out_count(str, n);
return n;
out_count(str, len);
return len;
}
int _dvprintf(const char *fmt, va_list ap)

9
lib/libc/printf.c
View File

@@ -367,7 +367,7 @@ static int _vsnprintf_output(const char *str, size_t len, void *state)
struct _output_args *args = state;
size_t count = 0;
while (count < len && *str) {
while (count < len) {
if (args->pos < args->len) {
args->outstr[args->pos++] = *str;
}
@@ -586,9 +586,11 @@ hex:
/* shared output code */
_output_string:
string_len = strlen(s);
if (flags & LEFTFORMATFLAG) {
/* left justify the text */
OUTPUT_STRING(s, SIZE_MAX);
OUTPUT_STRING(s, string_len);
uint written = err;
/* pad to the right (if necessary) */
@@ -596,7 +598,6 @@ _output_string:
OUTPUT_CHAR(' ');
} else {
/* right justify the text (digits) */
string_len = strlen(s);
/* if we're going to print a sign digit,
it'll chew up one byte of the format size */
@@ -616,7 +617,7 @@ _output_string:
OUTPUT_CHAR(signchar);
/* output the string */
OUTPUT_STRING(s, SIZE_MAX);
OUTPUT_STRING(s, string_len);
}
continue;
}