From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oi1-x22d.google.com (mail-oi1-x22d.google.com [IPv6:2607:f8b0:4864:20::22d]) by sourceware.org (Postfix) with ESMTPS id CD306385801A for ; Sat, 27 Mar 2021 17:50:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org CD306385801A Received: by mail-oi1-x22d.google.com with SMTP id n8so9052899oie.10 for ; Sat, 27 Mar 2021 10:50:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=TdRQoFJJIGPrucaWrQ5XLqLZF8T+zDynSq5mnpKW6/A=; b=ejgE6Vxsb6wMkjhZzvgJXfpHkTxpfqRXpTwuzumCrNeXpcx1zi4vbWW2biClVkc3w9 3K7CM8eVdqZb3UabI1bJVUdkT1O1+GxgEYgB5NNLVTL5tTspyFr09gR8N3pakmG6VURZ lBPXCL1KU5WVy9TurfuwnpLtDafVdZXcNeQs4bhDwMZY4RDi2KSKAYansODMpqgCyNhs 0hq6tWeKnoDeNvuMxRnaHjh/lscsNWJcxmoAonLlgdtPQGcsb7qInEZvsM1rOWYr3+Fv xMt8p5q0BzRiER5GhLmduVrKT/w92DTVOm1MkusRDqcWWvlK6FW38zGlC1qs/ebERpaI 1elQ== X-Gm-Message-State: AOAM533sq6fbfzr+ObL7g1arWlBnltnFlARvkuXBmq2HHgtvf3kR3wON TIb44rXRKSjJKwx+qHwQGca+v04PmOhzdQ+bX360SjimNis= X-Google-Smtp-Source: ABdhPJzS6YFvOzijb5Jfmve0cxE3Q6cyBKIFoNSicorBkR8LunXcIEDrZ0SE/OLJLzYpJlb/2yaUEVxAmwLLxbEuIYo= X-Received: by 2002:a05:6808:10c5:: with SMTP id s5mr13712443ois.58.1616867421221; Sat, 27 Mar 2021 10:50:21 -0700 (PDT) MIME-Version: 1.0 References: <20210327162433.3215479-1-hjl.tools@gmail.com> <87lfa88p8l.fsf@mid.deneb.enyo.de> In-Reply-To: <87lfa88p8l.fsf@mid.deneb.enyo.de> From: "H.J. Lu" Date: Sat, 27 Mar 2021 10:49:45 -0700 Message-ID: Subject: [PATCH v2] Initialize wchar_t string with wmemset [BZ #27655] To: Florian Weimer Cc: "H.J. Lu via Libc-alpha" Content-Type: multipart/mixed; boundary="0000000000004a9a6e05be884883" X-Spam-Status: No, score=-3035.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Mar 2021 17:50:23 -0000 --0000000000004a9a6e05be884883 Content-Type: text/plain; charset="UTF-8" On Sat, Mar 27, 2021 at 10:45 AM Florian Weimer 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 > > # 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. --0000000000004a9a6e05be884883 Content-Type: text/x-patch; charset="US-ASCII"; name="v2-0001-Initialize-wchar_t-string-with-wmemset-BZ-27655.patch" Content-Disposition: attachment; filename="v2-0001-Initialize-wchar_t-string-with-wmemset-BZ-27655.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_kms12icf0 RnJvbSBjMTYyZmEwMTIwMGYwNzI3N2ExYjRkZDE3Zjk1MjJlODQ2MGFlYWY4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiAiSC5KLiBMdSIgPGhqbC50b29sc0BnbWFpbC5jb20+CkRhdGU6 IFNhdCwgMjcgTWFyIDIwMjEgMDk6MTU6MDAgLTA3MDAKU3ViamVjdDogW1BBVENIIHYyXSBJbml0 aWFsaXplIHdjaGFyX3Qgc3RyaW5nIHdpdGggd21lbXNldCBbQlogIzI3NjU1XQoKVXNlIHdtZW1z ZXQgdG8gaW5pdGlhbGl6ZSB3Y2hhcl90IHN0cmluZy4KLS0tCiBzdHJpbmcvdGVzdC1zdHJubGVu LmMgfCA0ICsrKy0KIDEgZmlsZSBjaGFuZ2VkLCAzIGluc2VydGlvbnMoKyksIDEgZGVsZXRpb24o LSkKCmRpZmYgLS1naXQgYS9zdHJpbmcvdGVzdC1zdHJubGVuLmMgYi9zdHJpbmcvdGVzdC1zdHJu bGVuLmMKaW5kZXggYTQ5ZDkzYWZhMi4uYjk4ZGMxMGE1NiAxMDA2NDQKLS0tIGEvc3RyaW5nL3Rl c3Qtc3Rybmxlbi5jCisrKyBiL3N0cmluZy90ZXN0LXN0cm5sZW4uYwpAQCAtMjcsNiArMjcsNyBA QAogCiAjaWZuZGVmIFdJREUKICMgZGVmaW5lIFNUUk5MRU4gc3RybmxlbgorIyBkZWZpbmUgTUVN U0VUIG1lbXNldAogIyBkZWZpbmUgQ0hBUiBjaGFyCiAjIGRlZmluZSBCSUdfQ0hBUiBDSEFSX01B WAogIyBkZWZpbmUgTUlERExFX0NIQVIgMTI3CkBAIC0zNCw2ICszNSw3IEBACiAjZWxzZQogIyBp bmNsdWRlIDx3Y2hhci5oPgogIyBkZWZpbmUgU1RSTkxFTiB3Y3NubGVuCisjIGRlZmluZSBNRU1T RVQgd21lbXNldAogIyBkZWZpbmUgQ0hBUiB3Y2hhcl90CiAjIGRlZmluZSBCSUdfQ0hBUiBXQ0hB Ul9NQVgKICMgZGVmaW5lIE1JRERMRV9DSEFSIDExMjEKQEAgLTE1Myw3ICsxNTUsNyBAQCBkb19w YWdlX3Rlc3RzICh2b2lkKQogICBzaXplX3QgbGFzdF9vZmZzZXQgPSAocGFnZV9zaXplIC8gc2l6 ZW9mIChDSEFSKSkgLSAxOwogCiAgIENIQVIgKnMgPSAoQ0hBUiAqKSBidWYyOwotICBtZW1zZXQg KHMsIDY1LCAobGFzdF9vZmZzZXQgLSAxKSk7CisgIE1FTVNFVCAocywgNjUsIChsYXN0X29mZnNl dCAtIDEpKTsKICAgc1tsYXN0X29mZnNldF0gPSAwOwogCiAgIC8qIFBsYWNlIHNob3J0IHN0cmlu Z3MgZW5kaW5nIGF0IHBhZ2UgYm91bmRhcnkuICAqLwotLSAKMi4zMC4yCgo= --0000000000004a9a6e05be884883--