This is the mail archive of the libc-alpha@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: [PATCH] vfprintf: Add test case for user-defined types and format specifiers


On 06/29/2017 12:51 PM, H.J. Lu wrote:
> On Thu, Jun 29, 2017 at 12:31 AM, Florian Weimer <fweimer@redhat.com> wrote:
>> On 06/19/2017 03:48 PM, Florian Weimer wrote:
>>> 2017-06-19  Florian Weimer  <fweimer@redhat.com>
>>>
>>>       * stdio-common/tst-vfprintf-user-type.c: New file.
>>>       * stdio-common/Makefile (tests): Add tst-vfprintf-user-type.
>>
>> I am going to commit this soon.
>>
> 
> It fails on i686:
> 
> tst-vfprintf-user-type.c: In function \u2018my_printf_function\u2019:
> tst-vfprintf-user-type.c:58:55: error: format \u2018%c\u2019 expects
> argument of type \u2018int\u2019, but argument 7 has type
> \u2018wchar_t {aka const long int}\u2019 [-Werror=format=]
> tst-vfprintf-user-type.c: In function \u2018my_arginfo_function\u2019:
> tst-vfprintf-user-type.c:112:55: error: format \u2018%c\u2019 expects
> argument of type \u2018int\u2019, but argument 7 has type
> \u2018wchar_t {aka const long int}\u2019 [-Werror=format=]

Please try the attached patch.

The need for the wint_t cast looks like a GCC bug.

Thanks,
Florian
vfprintf: Fix tst-vfprintf-mbs-prec and tst-vfprintf-user-type

2017-06-29  Florian Weimer  <fweimer@redhat.com>

	* stdio-common/tst-vfprintf-user-type.c (my_printf_function):
	Adjust format string.
	* stdio-common/Makefile (tst-vfprintf-mbs-prec.out): Add locale
	dependency.

diff --git a/stdio-common/Makefile b/stdio-common/Makefile
index 309d83e..622a85f 100644
--- a/stdio-common/Makefile
+++ b/stdio-common/Makefile
@@ -87,6 +87,7 @@ $(objpfx)tst-grouping.out: $(gen-locales)
 $(objpfx)tst-sprintf.out: $(gen-locales)
 $(objpfx)tst-sscanf.out: $(gen-locales)
 $(objpfx)tst-swprintf.out: $(gen-locales)
+$(objpfx)tst-vfprintf-mbs-prec.out: $(gen-locales)
 endif
 
 tst-printf-bz18872-ENV = MALLOC_TRACE=$(objpfx)tst-printf-bz18872.mtrace
diff --git a/stdio-common/tst-vfprintf-user-type.c b/stdio-common/tst-vfprintf-user-type.c
index e9596c3..91ea02f 100644
--- a/stdio-common/tst-vfprintf-user-type.c
+++ b/stdio-common/tst-vfprintf-user-type.c
@@ -29,6 +29,7 @@
 #include <support/check.h>
 #include <support/support.h>
 #include <support/test-driver.h>
+#include <wchar.h>
 
 /* Initialized by do_test using register_printf_type.  */
 static int user_type;
@@ -55,8 +56,9 @@ my_printf_function (FILE *fp, const struct printf_info *info,
                     const void *const *args)
 {
   if (test_verbose > 0)
-    printf ("info: %s (%p, %p, {%p}@%p) called for %%%c (prec %d)\n",
-            __func__, fp, info, args[0], args, info->spec, info->prec);
+    printf ("info: %s (%p, %p, {%p}@%p) called for %%%lc (prec %d)\n",
+            __func__, fp, info, args[0], args, (wint_t) info->spec,
+            info->prec);
 
   TEST_VERIFY (info->spec == 'P');
   size_t nargs;
@@ -109,8 +111,9 @@ my_arginfo_function (const struct printf_info *info,
   if (info->spec != 'P')
     return -1;
   if (test_verbose > 0)
-    printf ("info: %s (%p, %zu, %p, %p) called for %%%c (prec %d)\n",
-            __func__, info, n, argtypes, size, info->spec, info->prec);
+    printf ("info: %s (%p, %zu, %p, %p) called for %%%lc (prec %d)\n",
+            __func__, info, n, argtypes, size, (wint_t) info->spec,
+            info->prec);
 
   TEST_VERIFY_EXIT (n >= 1);
   size_t nargs;

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]