svn commit: r264486 - head/cddl/contrib/opensolaris/lib/libdtrace/common
Mark Johnston
markj at FreeBSD.org
Tue Apr 15 02:28:09 UTC 2014
Author: markj
Date: Tue Apr 15 02:28:08 2014
New Revision: 264486
URL: http://svnweb.freebsd.org/changeset/base/264486
Log:
Use the correct format specifiers for wide characters and strings of wide
characters.
MFC after: 1 week
Modified:
head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c
Modified: head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c
==============================================================================
--- head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c Tue Apr 15 02:17:46 2014 (r264485)
+++ head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c Tue Apr 15 02:28:08 2014 (r264486)
@@ -694,8 +694,13 @@ static const dt_pfconv_t _dtrace_convers
{ "S", "s", pfproto_cstr, pfcheck_str, pfprint_estr },
{ "T", "s", "int64_t", pfcheck_time, pfprint_time822 },
{ "u", "u", pfproto_xint, pfcheck_xint, pfprint_uint },
+#if defined(sun)
{ "wc", "wc", "int", pfcheck_type, pfprint_sint }, /* a.k.a. wchar_t */
{ "ws", "ws", pfproto_wstr, pfcheck_wstr, pfprint_wstr },
+#else
+{ "wc", "lc", "int", pfcheck_type, pfprint_sint }, /* a.k.a. wchar_t */
+{ "ws", "ls", pfproto_wstr, pfcheck_wstr, pfprint_wstr },
+#endif
{ "x", "x", pfproto_xint, pfcheck_xint, pfprint_uint },
{ "X", "X", pfproto_xint, pfcheck_xint, pfprint_uint },
{ "Y", "s", "int64_t", pfcheck_time, pfprint_time },
More information about the svn-src-all
mailing list