From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-4.0 required=3.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id A6AA61F45E for ; Mon, 17 Feb 2020 10:57:17 +0000 (UTC) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:mime-version :content-type:content-transfer-encoding; q=dns; s=default; b=DhT iZAJwFrH/UKIqIzRVInm4l3Kt6lAz2nevx6YUuwKozS1oUmFm7WQ0rpYAAt7PEXX QBZwXq8kzbnXwY/Ek/hn6NxS2opkubN97U8g9bHMN7DSpVznJutSSuSaSKcs1Mhl wLs0ih5Wrq0wkAGsf/jsbJIQZjFAZzJyziX44m4w= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:mime-version :content-type:content-transfer-encoding; s=default; bh=Hnfs+FP3I gX//uMolfPoHrsoAF4=; b=GFa4XYgLbV2qLF/80xkPO64jzevJJ7zfsoZILIzsN 1vFYVcZ8u7v647BzP5E21BkDZb3ftK4RbKEn6sE9IFHb0fUDVcj9oLjjl+Fv5cDt xoEARfOmjyibZPfvaYicU3itBjopAiZRzdpVQwFUoj7EEuOqAbWd9Vlq1OXvAn8A Wg= Received: (qmail 23261 invoked by alias); 17 Feb 2020 10:57:15 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Received: (qmail 23169 invoked by uid 89); 17 Feb 2020 10:57:14 -0000 Authentication-Results: sourceware.org; auth=none X-HELO: us-smtp-1.mimecast.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581937031; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BPypEpdvHqmRT0DM2Ta/blW1SXAmTBWMkCJ/C7feXlk=; b=EuhVkbg+Jdj7S+oQMAZkbSlHEtmJcdqYRee8xAUzcx0pHdzILmeyrAwJGDqcVzG9BGVz7y rQh8u3VMZw2PbsQvYoKkDuEAKc1tdw3o7NNGckX4gAZBWs3WOGXoPnDLWTwdU8s4ho6vdQ LFLWo7EPNsr+2KJw9JFfQ27VhEDx6+c= From: Florian Weimer To: libc-alpha@sourceware.org Subject: [PATCH] wcsmbs: Avoid escaped character literals in Date: Mon, 17 Feb 2020 11:57:05 +0100 Message-ID: <8736b9scqm.fsf@oldenburg2.str.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain Content-Transfer-Encoding: quoted-printable They confuse scripts/conformtest.py because it treats the L and the x7f as namespace-violating identifiers. These failures are only visibile if the conform tests are run in such a way that __USE_EXTERN_INLINES is defined. ----- wcsmbs/wchar.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wcsmbs/wchar.h b/wcsmbs/wchar.h index 5e0d65b14e..3e88be1f16 100644 --- a/wcsmbs/wchar.h +++ b/wcsmbs/wchar.h @@ -316,13 +316,13 @@ extern size_t mbrlen (const char *__restrict __s, siz= e_t __n, extern wint_t __btowc_alias (int __c) __asm ("btowc"); __extern_inline wint_t __NTH (btowc (int __c)) -{ return (__builtin_constant_p (__c) && __c >=3D '\0' && __c <=3D '\x7f' +{ return (__builtin_constant_p (__c) && __c >=3D 0 && __c <=3D 0x7f =09 ? (wint_t) __c : __btowc_alias (__c)); } =20 extern int __wctob_alias (wint_t __c) __asm ("wctob"); __extern_inline int __NTH (wctob (wint_t __wc)) -{ return (__builtin_constant_p (__wc) && __wc >=3D L'\0' && __wc <=3D L'\x= 7f' +{ return (__builtin_constant_p (__wc) && __wc >=3D 0 && __wc <=3D 0x7f =09 ? (int) __wc : __wctob_alias (__wc)); } =20 __extern_inline size_t