From patchwork Sat Mar 27 17:49:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 42789 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A7BC73857821; Sat, 27 Mar 2021 17:50:23 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A7BC73857821 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1616867423; bh=TdRQoFJJIGPrucaWrQ5XLqLZF8T+zDynSq5mnpKW6/A=; h=References:In-Reply-To:Date:Subject:To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=gaCu7rtbjitdCBO8jtEvCPETc4jcvpNZGbEtABX/FKFhoJnZgKid/6biX9bUn0xqd XOzEztnTwYMeUV6rSxvjqnkXZo16GUaJ3sc/UCh6QWZV5nkStoX0YXyXw6k67G/i/C KUZTTN+5sCJig92TluDX6m2afizxLR8kAVtgJf7M= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org 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> 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 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-Patchwork-Original-From: "H.J. Lu via Libc-alpha" From: "H.J. Lu" Reply-To: "H.J. Lu" Cc: "H.J. Lu via Libc-alpha" Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" 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. From c162fa01200f07277a1b4dd17f9522e8460aeaf8 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" 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 # 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