From ff7c213c650d7fe40bd3b568b0974462c821b271 Mon Sep 17 00:00:00 2001 From: Mark Stapp Date: Tue, 23 Mar 2021 14:48:58 -0400 Subject: [PATCH 1/2] lib: enlarge the local buffer for printfrr extension tokens Make the local buffer offered to printfrr extension tokens bigger; existing size wasn't quite enough for some of the more elaborate struct prefix types. Signed-off-by: Mark Stapp --- lib/printf/vfprintf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/printf/vfprintf.c b/lib/printf/vfprintf.c index a0634cde4b..8c7a8a58c4 100644 --- a/lib/printf/vfprintf.c +++ b/lib/printf/vfprintf.c @@ -138,7 +138,7 @@ __wcsconv(wchar_t *wcsarg, int prec) * write a uintmax_t in octal (plus one byte). */ #if UINTMAX_MAX <= UINT64_MAX -#define BUF 64 +#define BUF 80 #else #error "BUF must be large enough to format a uintmax_t" #endif From f62fd2ac9f577f725ef07f8d534eb6aaf0577021 Mon Sep 17 00:00:00 2001 From: Mark Stapp Date: Tue, 23 Mar 2021 14:50:14 -0400 Subject: [PATCH 2/2] tests: use printfrr to use extended format specs Test was using 'pFX' with printf() - need to use printfrr(). Signed-off-by: Mark Stapp --- tests/lib/test_table.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/lib/test_table.c b/tests/lib/test_table.c index 290657bd56..9b6539e3bc 100644 --- a/tests/lib/test_table.c +++ b/tests/lib/test_table.c @@ -20,7 +20,7 @@ */ #include - +#include "printfrr.h" #include "prefix.h" #include "table.h" @@ -113,7 +113,7 @@ static void print_subtree(struct route_node *rn, const char *legend, printf(" "); } - printf("%s: %pFX", legend, &rn->p); + printfrr("%s: %pFX", legend, &rn->p); if (!rn->info) { printf(" (internal)"); }