X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=tests%2Funit%2Fsnprintf%2Fsnprintf.c;fp=tests%2Funit%2Fsnprintf%2Fsnprintf.c;h=539bb0ac7c85eae191f363335488206230456f66;hb=3c99db226fd7e6100f300549cdcb3e8dc7d4c270;hp=a2fbdc96ddfbec202ad414e9748665ab712d535a;hpb=4041a8a71441f133654c4ca2a187748e08f03b22;p=lttng-ust.git

diff --git a/tests/unit/snprintf/snprintf.c b/tests/unit/snprintf/snprintf.c
index a2fbdc96..539bb0ac 100644
--- a/tests/unit/snprintf/snprintf.c
+++ b/tests/unit/snprintf/snprintf.c
@@ -13,19 +13,14 @@
 int main()
 {
 	char buf[100];
-	char *expected;
-	char test_fmt_str[] = "header %d, %s, %03d, '%3$*d'";
-	char escaped_test_fmt_str[] = "header %%d, %%s, %%03d, '%%3$*d'";
+	const char expected_str[] = "header 9999, hello, 005, '    9'";
+	const char test_fmt_str[] = "header %d, %s, %03d, '%*d'";
 
 	plan_tests(1);
 
-	expected = "header 9999, hello, 005, '    9'";
-	ust_safe_snprintf(buf, 99, test_fmt_str, 9999, "hello", 5, 9);
+	ust_safe_snprintf(buf, 99, test_fmt_str, 9999, "hello", 5, 5, 9);
 
-	char test_desc_fmt_str[] = "Got expected output string with format string \"%s\"";
-	char test_desc[sizeof(escaped_test_fmt_str) + sizeof(test_desc_fmt_str) - 1];
-	sprintf(test_desc, test_desc_fmt_str, escaped_test_fmt_str);
-	ok(strcmp(buf, expected) == 0, test_desc);
+	ok(strcmp(buf, expected_str) == 0, "Got expected output string with format string \"%s\"", test_fmt_str);
 
 	return exit_status();
 }