From a4cd456fcdf80053fe12c89fc7471d39e55f60f1 Mon Sep 17 00:00:00 2001 From: Zebity Spring Date: Fri, 12 Jul 2019 17:33:46 +1000 Subject: [PATCH] Merge upstream, address conflict in src/utils/cmds/cmds_test.c (cherry picked from commit a72ad42076337f3b85db3b06565ae86a83226ab3) --- src/utils/cmds/cmds_test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/cmds/cmds_test.c b/src/utils/cmds/cmds_test.c index 4f449a37..ff7c8cc9 100644 --- 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); - snprintf(description, sizeof(description), + ssnprintf(description, sizeof(description), "cmd_parse (\"%s\", opts=%p) = " "%d (type=%d [%s]); want %d " "(type=%d [%s])", -- 2.11.0