| Message ID | 20210327162433.3215479-1-hjl.tools@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | Initialize wchar_t string with wmemset [BZ #27655] | expand |
* 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?
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 @@ -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. */