diff mbox series

[v2] Initialize wchar_t string with wmemset [BZ #27655]

Message ID CAMe9rOrgULKOwK99TZrhCDRh=LsksanORE_V7H5hUpZxBWwX2w@mail.gmail.com
State Committed
Headers
Series [v2] Initialize wchar_t string with wmemset [BZ #27655] |

Commit Message

H.J. Lu March 27, 2021, 5:49 p.m. UTC 
  On Sat, Mar 27, 2021 at 10:45 AM Florian Weimer <fw@deneb.enyo.de> wrote:
>
> * H. J. Lu via Libc-alpha:
>
> > Use wmemset to initialize wchar_t string.
> > ---
> >  string/test-strnlen.c | 4 +++-
> >  1 file changed, 3 insertions(+), 1 deletion(-)
> >
> > diff --git a/string/test-strnlen.c b/string/test-strnlen.c
> > index a49d93afa2..6163079d12 100644
> > --- a/string/test-strnlen.c
> > +++ b/string/test-strnlen.c
> > @@ -27,6 +27,7 @@
> >
> >  #ifndef WIDE
> >  # define STRNLEN strnlen
> > +# define MEMSET memset
> >  # define CHAR char
> >  # define BIG_CHAR CHAR_MAX
> >  # define MIDDLE_CHAR 127
> > @@ -34,6 +35,7 @@
> >  #else
> >  # include <wchar.h>
> >  # define STRNLEN wcsnlen
> > +# define MEMSET memset
> >  # define CHAR wchar_t
> >  # define BIG_CHAR WCHAR_MAX
> >  # define MIDDLE_CHAR 1121
>
> Shouldn't the second one be wmemset?

You are right.   Here is the v2 patch.

Comments

Florian Weimer March 27, 2021, 5:52 p.m. UTC | #1 
* H. J. Lu:

> Subject: [PATCH v2] Initialize wchar_t string with wmemset [BZ #27655]
>
> Use wmemset to initialize wchar_t string.
> ---
>  string/test-strnlen.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/string/test-strnlen.c b/string/test-strnlen.c
> index a49d93afa2..b98dc10a56 100644
> --- a/string/test-strnlen.c
> +++ b/string/test-strnlen.c
> @@ -27,6 +27,7 @@
>  
>  #ifndef WIDE
>  # define STRNLEN strnlen
> +# define MEMSET memset
>  # define CHAR char
>  # define BIG_CHAR CHAR_MAX
>  # define MIDDLE_CHAR 127
> @@ -34,6 +35,7 @@
>  #else
>  # include <wchar.h>
>  # define STRNLEN wcsnlen
> +# define MEMSET wmemset
>  # define CHAR wchar_t
>  # define BIG_CHAR WCHAR_MAX
>  # define MIDDLE_CHAR 1121
> @@ -153,7 +155,7 @@ do_page_tests (void)
>    size_t last_offset = (page_size / sizeof (CHAR)) - 1;
>  
>    CHAR *s = (CHAR *) buf2;
> -  memset (s, 65, (last_offset - 1));
> +  MEMSET (s, 65, (last_offset - 1));
>    s[last_offset] = 0;
>  
>    /* Place short strings ending at page boundary.  */

Patch looks good.  Please change the commit message to mention that
this changes just a test.
H.J. Lu March 27, 2021, 5:56 p.m. UTC | #2 
On Sat, Mar 27, 2021 at 10:52 AM Florian Weimer <fw@deneb.enyo.de> wrote:
>
> * H. J. Lu:
>
> > Subject: [PATCH v2] Initialize wchar_t string with wmemset [BZ #27655]
> >
> > Use wmemset to initialize wchar_t string.
> > ---
> >  string/test-strnlen.c | 4 +++-
> >  1 file changed, 3 insertions(+), 1 deletion(-)
> >
> > diff --git a/string/test-strnlen.c b/string/test-strnlen.c
> > index a49d93afa2..b98dc10a56 100644
> > --- a/string/test-strnlen.c
> > +++ b/string/test-strnlen.c
> > @@ -27,6 +27,7 @@
> >
> >  #ifndef WIDE
> >  # define STRNLEN strnlen
> > +# define MEMSET memset
> >  # define CHAR char
> >  # define BIG_CHAR CHAR_MAX
> >  # define MIDDLE_CHAR 127
> > @@ -34,6 +35,7 @@
> >  #else
> >  # include <wchar.h>
> >  # define STRNLEN wcsnlen
> > +# define MEMSET wmemset
> >  # define CHAR wchar_t
> >  # define BIG_CHAR WCHAR_MAX
> >  # define MIDDLE_CHAR 1121
> > @@ -153,7 +155,7 @@ do_page_tests (void)
> >    size_t last_offset = (page_size / sizeof (CHAR)) - 1;
> >
> >    CHAR *s = (CHAR *) buf2;
> > -  memset (s, 65, (last_offset - 1));
> > +  MEMSET (s, 65, (last_offset - 1));
> >    s[last_offset] = 0;
> >
> >    /* Place short strings ending at page boundary.  */
>
> Patch looks good.  Please change the commit message to mention that
> this changes just a test.

I changed the commit subject to

test-strnlen.c: Initialize wchar_t string with wmemset [BZ #27655]
H.J. Lu Jan. 27, 2022, 5:06 p.m. UTC | #3 
On Sat, Mar 27, 2021 at 10:56 AM H.J. Lu <hjl.tools@gmail.com> wrote:
>
> On Sat, Mar 27, 2021 at 10:52 AM Florian Weimer <fw@deneb.enyo.de> wrote:
> >
> > * H. J. Lu:
> >
> > > Subject: [PATCH v2] Initialize wchar_t string with wmemset [BZ #27655]
> > >
> > > Use wmemset to initialize wchar_t string.
> > > ---
> > >  string/test-strnlen.c | 4 +++-
> > >  1 file changed, 3 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/string/test-strnlen.c b/string/test-strnlen.c
> > > index a49d93afa2..b98dc10a56 100644
> > > --- a/string/test-strnlen.c
> > > +++ b/string/test-strnlen.c
> > > @@ -27,6 +27,7 @@
> > >
> > >  #ifndef WIDE
> > >  # define STRNLEN strnlen
> > > +# define MEMSET memset
> > >  # define CHAR char
> > >  # define BIG_CHAR CHAR_MAX
> > >  # define MIDDLE_CHAR 127
> > > @@ -34,6 +35,7 @@
> > >  #else
> > >  # include <wchar.h>
> > >  # define STRNLEN wcsnlen
> > > +# define MEMSET wmemset
> > >  # define CHAR wchar_t
> > >  # define BIG_CHAR WCHAR_MAX
> > >  # define MIDDLE_CHAR 1121
> > > @@ -153,7 +155,7 @@ do_page_tests (void)
> > >    size_t last_offset = (page_size / sizeof (CHAR)) - 1;
> > >
> > >    CHAR *s = (CHAR *) buf2;
> > > -  memset (s, 65, (last_offset - 1));
> > > +  MEMSET (s, 65, (last_offset - 1));
> > >    s[last_offset] = 0;
> > >
> > >    /* Place short strings ending at page boundary.  */
> >
> > Patch looks good.  Please change the commit message to mention that
> > this changes just a test.
>
> I changed the commit subject to
>
> test-strnlen.c: Initialize wchar_t string with wmemset [BZ #27655]
>
> --
> H.J.

I am backporting this to release branches.
diff mbox series

Patch

From c162fa01200f07277a1b4dd17f9522e8460aeaf8 Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Sat, 27 Mar 2021 09:15:00 -0700
Subject: [PATCH v2] Initialize wchar_t string with wmemset [BZ #27655]

Use wmemset to initialize wchar_t string.
---
 string/test-strnlen.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/string/test-strnlen.c b/string/test-strnlen.c
index a49d93afa2..b98dc10a56 100644
--- a/string/test-strnlen.c
+++ b/string/test-strnlen.c
@@ -27,6 +27,7 @@ 
 
 #ifndef WIDE
 # define STRNLEN strnlen
+# define MEMSET memset
 # define CHAR char
 # define BIG_CHAR CHAR_MAX
 # define MIDDLE_CHAR 127
@@ -34,6 +35,7 @@ 
 #else
 # include <wchar.h>
 # define STRNLEN wcsnlen
+# define MEMSET wmemset
 # define CHAR wchar_t
 # define BIG_CHAR WCHAR_MAX
 # define MIDDLE_CHAR 1121
@@ -153,7 +155,7 @@  do_page_tests (void)
   size_t last_offset = (page_size / sizeof (CHAR)) - 1;
 
   CHAR *s = (CHAR *) buf2;
-  memset (s, 65, (last_offset - 1));
+  MEMSET (s, 65, (last_offset - 1));
   s[last_offset] = 0;
 
   /* Place short strings ending at page boundary.  */
-- 
2.30.2