patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

lib: cbprintf: fix pointer justification and padding

Browse source 
Although flags with pointers are not defined behavior, there is a
desire to have them work, so add a test and fix the complete
implementation so it passes.

Signed-off-by: Peter Bigot <peter.bigot@nordicsemi.no>
This commit is contained in:
Peter Bigot 2020-11-14 10:10:42 -06:00 committed by Carles Cufí
parent d583af7707
commit 607b390ba4
2 changed files with 37 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/os/cbprintf_complete.c
View file

@ -1601,6 +1601,7 @@ int cbvprintf(cbprintf_cb out, void *ctx, const char *fp, va_list ap)
case 'X':
bps = encode_uint(value.uint, &conv, buf, bpe);
prec_int_pad0:
/* Update pad0 values based on precision and converted
* length. Note that a non-empty sign is not in the
* converted sequence, but it does not affect the
@ -1629,14 +1630,17 @@ int cbvprintf(cbprintf_cb out, void *ctx, const char *fp, va_list ap)
if (value.ptr != NULL) {
bps = encode_uint((uintptr_t)value.ptr, &conv,
buf, bpe);
/* Use 0x prefix */
conv.altform_0c = true;
conv.specifier = 'x';
} else {
bps = "(nil)";
bpe = bps + 5;
goto prec_int_pad0;
}
bps = "(nil)";
bpe = bps + 5;
break;
case 'n':
if (IS_ENABLED(CONFIG_CBPRINTF_N_SPECIFIER)) {
@ -1796,7 +1800,6 @@ int cbvprintf(cbprintf_cb out, void *ctx, const char *fp, va_list ap)
OUTC(' ');
--width;
}
}
return count;

31
tests/unit/cbprintf/main.c
View file

@ -924,8 +924,37 @@ static void test_p(void)
rc = TEST_PRF("%p", ptr);
PRF_CHECK("0xcafe21", rc);
rc = TEST_PRF("%p", NULL);
printf("buffer '%s'\n", buf);
PRF_CHECK("(nil)", rc);
/* Nano doesn't support left-justification of pointer
* values.
*/
if (!IS_ENABLED(CONFIG_CBPRINTF_NANO)) {
reset_out();
rc = rawprf("/%12p/", ptr);
zassert_equal(rc, 14, NULL);
zassert_equal(strncmp("/ 0xcafe21/", buf, rc), 0, NULL);
}
reset_out();
rc = rawprf("/%-12p/", ptr);
if (IS_ENABLED(CONFIG_CBPRINTF_NANO)
&& !IS_ENABLED(CONFIG_CBPRINTF_LIBC_SUBSTS)) {
zassert_equal(rc, 0, NULL);
rc = 14;
} else {
zassert_equal(rc, 14, NULL);
}
zassert_equal(strncmp("/0xcafe21 /", buf, rc), 0, NULL);
/* Nano doesn't support zero-padding of pointer values.
*/
if (!IS_ENABLED(CONFIG_CBPRINTF_NANO)) {
reset_out();
rc = rawprf("/%.8p/", ptr);
zassert_equal(rc, 12, NULL);
zassert_equal(strncmp("/0x00cafe21/", buf, rc), 0, NULL);
}
}
static int out_counter(int c,