Author: ngie
Date: Fri Jun 10 18:13:41 2016
New Revision: 301808
URL: https://svnweb.freebsd.org/changeset/base/301808
Log:
MFC r299511:
r299511 (by cem):
print_positional_test: Fix misuse of wchar APIs
These APIs take unit length, not byte length parameters.
CIDs: 1338543, 1338544, 1338545
Modified:
stable/10/lib/libc/tests/stdio/print_positional_test.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/lib/libc/tests/stdio/print_positional_test.c
==============================================================================
--- stable/10/lib/libc/tests/stdio/print_positional_test.c Fri Jun 10
18:12:11 2016 (r301807)
+++ stable/10/lib/libc/tests/stdio/print_positional_test.c Fri Jun 10
18:13:41 2016 (r301808)
@@ -32,6 +32,7 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
+#include <sys/param.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -94,7 +95,7 @@ ATF_TC_WITHOUT_HEAD(positional_wide);
ATF_TC_BODY(positional_wide, tc)
{
- swprintf(wbuf1, sizeof wbuf1,
+ swprintf(wbuf1, nitems(wbuf1),
L"|xx %1$s %2$s %3$s %4$s\n"
"|xx %5$s %6$s %7$s %8$s\n"
"|xx %9$s %10$s %11$s %12$s\n"
@@ -117,7 +118,7 @@ ATF_TC_BODY(positional_wide, tc)
"43", "44", 45, -1L, 1LL, -1, 1LL
);
temp = correct;
- mbsrtowcs(wbuf2, &temp, sizeof wbuf2, NULL);
+ mbsrtowcs(wbuf2, &temp, nitems(wbuf2), NULL);
ATF_REQUIRE_MSG(wcscmp(wbuf1, wbuf2) == 0,
"buffers didn't match");
}
@@ -139,7 +140,7 @@ ATF_TC_BODY(positional_precision_wide, t
swprintf(wbuf1, sizeof buf, L"%2$.*4$s %2$.*3$s %1$s",
"BSD", "bsd", 2, 1);
temp = correct2;
- mbsrtowcs(wbuf2, &temp, sizeof wbuf2, NULL);
+ mbsrtowcs(wbuf2, &temp, nitems(wbuf2), NULL);
ATF_REQUIRE_MSG(wcscmp(wbuf1, wbuf2) == 0,
"buffers didn't match");
}
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
