X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=tests%2Funit%2Fsnprintf%2Fsnprintf.c;h=79f31357bb6d0f370a08a2d48e3571027dbf290a;hb=HEAD;hp=c1087402aec6a8f8d427176b67d9797a95194ebb;hpb=dbe6ade0ba17270b2cb119b9961bbb7e48ce4733;p=lttng-ust.git

diff --git a/tests/unit/snprintf/snprintf.c b/tests/unit/snprintf/snprintf.c
index c1087402..79f31357 100644
--- a/tests/unit/snprintf/snprintf.c
+++ b/tests/unit/snprintf/snprintf.c
@@ -1,42 +1,26 @@
-/* Copyright (C) 2009  Pierre-Marc Fournier
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+ * Copyright (C) 2009 Pierre-Marc Fournier
  */
 
 #include <stdio.h>
 #include <string.h>
-#include "ust_snprintf.h"
+#include "common/safe-snprintf.h"
 
 #include "tap.h"
 
-int main()
+int main(void)
 {
 	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();
 }