Merge upstream, address conflict in src/utils/cmds/cmds_test.c

(cherry picked from commit a72ad42076337f3b85db3b06565ae86a83226ab3)

diff --git a/src/utils/cmds/cmds_test.c b/src/utils/cmds/cmds_test.c
index 4f449a3..ff7c8cc 100644 (file)
--- a/src/utils/cmds/cmds_test.c
+++ b/src/utils/cmds/cmds_test.c
@@ -295,7 +295,7 @@ DEF_TEST(parse) {
     memset(&cmd, 0, sizeof(cmd));
 
     status = cmd_parse(input, &cmd, parse_data[i].opts, &err);
     memset(&cmd, 0, sizeof(cmd));
 
     status = cmd_parse(input, &cmd, parse_data[i].opts, &err);

-    snprintf(description, sizeof(description),
+    ssnprintf(description, sizeof(description),

              "cmd_parse (\"%s\", opts=%p) = "
              "%d (type=%d [%s]); want %d "
              "(type=%d [%s])",
              "cmd_parse (\"%s\", opts=%p) = "
              "%d (type=%d [%s]); want %d "
              "(type=%d [%s])",