test_printf: Remove custom appending of '|'

Instead of having an ifdef to decide whether to print a |, use the
'append' functionality of the main loop to print it.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: Yafang Shao <laoar.shao@gmail.com>
Reviewed-by: Petr Mladek <pmladek@suse.com>
Reviewed-by: Anshuman Khandual <anshuman.khandual@arm.com>
Signed-off-by: Petr Mladek <pmladek@suse.com>
Link: https://lore.kernel.org/r/20211019142621.2810043-4-willy@infradead.org

diff --git a/lib/test_printf.c b/lib/test_printf.c
index 4531063afd4537d1fd68a928b2473c8f6448cc02..ec584196cb99f0f44e6bda3cf5e63aa8529b881e 100644 (file)
--- a/lib/test_printf.c
+++ b/lib/test_printf.c
@@ -616,12 +616,7 @@ page_flags_test(int section, int node, int zone, int last_cpupid,
        if (flags & PAGEFLAGS_MASK) {
                snprintf(cmp_buf + size, BUF_SIZE - size, "%s", name);
                size = strlen(cmp_buf);
-#if SECTIONS_WIDTH || NODES_WIDTH || ZONES_WIDTH || \
-       LAST_CPUPID_WIDTH || KASAN_TAG_WIDTH
-               /* Other information also included in page flags */
-               snprintf(cmp_buf + size, BUF_SIZE - size, "|");
-               size = strlen(cmp_buf);
-#endif
+               append = true;
        }
 
        for (i = 0; i < ARRAY_SIZE(pft); i++) {