test_printf: Append strings more efficiently

Use scnprintf instead of snprintf + strlen.

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

diff --git a/lib/test_printf.c b/lib/test_printf.c
index ec584196cb99f0f44e6bda3cf5e63aa8529b881e..d09993fca46397c0008d00e284eec2d59a09c98c 100644 (file)
--- a/lib/test_printf.c
+++ b/lib/test_printf.c
@@ -614,8 +614,7 @@ page_flags_test(int section, int node, int zone, int last_cpupid,
        int i;
 
        if (flags & PAGEFLAGS_MASK) {
-               snprintf(cmp_buf + size, BUF_SIZE - size, "%s", name);
-               size = strlen(cmp_buf);
+               size += scnprintf(cmp_buf + size, BUF_SIZE - size, "%s", name);
                append = true;
        }
 
@@ -623,17 +622,14 @@ page_flags_test(int section, int node, int zone, int last_cpupid,
                if (!pft[i].width)
                        continue;
 
-               if (append) {
-                       snprintf(cmp_buf + size, BUF_SIZE - size, "|");
-                       size = strlen(cmp_buf);
-               }
+               if (append)
+                       size += scnprintf(cmp_buf + size, BUF_SIZE - size, "|");
 
                flags |= (values[i] & pft[i].mask) << pft[i].shift;
-               snprintf(cmp_buf + size, BUF_SIZE - size, "%s=", pft[i].name);
-               size = strlen(cmp_buf);
-               snprintf(cmp_buf + size, BUF_SIZE - size, pft[i].fmt,
-                        values[i] & pft[i].mask);
-               size = strlen(cmp_buf);
+               size += scnprintf(cmp_buf + size, BUF_SIZE - size, "%s=",
+                               pft[i].name);
+               size += scnprintf(cmp_buf + size, BUF_SIZE - size, pft[i].fmt,
+                               values[i] & pft[i].mask);
                append = true;
        }