From: "H.J. Lu" <hjl.tools@gmail.com>
To: Florian Weimer <fw@deneb.enyo.de>
Cc: "H.J. Lu via Libc-alpha" <libc-alpha@sourceware.org>
Subject: [PATCH v2] Initialize wchar_t string with wmemset [BZ #27655]
Date: Sat, 27 Mar 2021 10:49:45 -0700 [thread overview]
Message-ID: <CAMe9rOrgULKOwK99TZrhCDRh=LsksanORE_V7H5hUpZxBWwX2w@mail.gmail.com> (raw)
In-Reply-To: <87lfa88p8l.fsf@mid.deneb.enyo.de>
[-- Attachment #1: Type: text/plain, Size: 906 bytes --]
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.
--
H.J.
[-- Attachment #2: v2-0001-Initialize-wchar_t-string-with-wmemset-BZ-27655.patch --]
[-- Type: text/x-patch, Size: 1127 bytes --]
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
next prev parent reply other threads:[~2021-03-27 17:50 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-27 16:24 [PATCH] " H.J. Lu
2021-03-27 17:45 ` Florian Weimer
2021-03-27 17:49 ` H.J. Lu [this message]
2021-03-27 17:52 ` [PATCH v2] " Florian Weimer
2021-03-27 17:56 ` H.J. Lu
2022-01-27 17:06 ` H.J. Lu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAMe9rOrgULKOwK99TZrhCDRh=LsksanORE_V7H5hUpZxBWwX2w@mail.gmail.com' \
--to=hjl.tools@gmail.com \
--cc=fw@deneb.enyo.de \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).