From patchwork Thu Nov 24 14:32:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 61079 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 8ABF03830B2A for ; Thu, 24 Nov 2022 14:33:24 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8ABF03830B2A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1669300404; bh=nOBl3tAB3cXTnOzFFBBd4isPwKZSKI49nIuWV03p3AQ=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=m/Rd5bTJT3x0OC8obrPQoalqNla2197ohC1nUmJnfoRVUalnGIfjc56FwpbBF6pli XlsTlCXIe/zLOgG/HlrwdBdj5Gp9JyWZKUiKo5R80xZcYX3gn66sODzGJdEOf0TnzS DHlwekqzIt0JByfv4GYsbYcBQwjQD1TbOEsXh6Xo= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 887583832368 for ; Thu, 24 Nov 2022 14:32:56 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 887583832368 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-407-sZTQ2LyfP7iNF-tZBe99UQ-1; Thu, 24 Nov 2022 09:32:54 -0500 X-MC-Unique: sZTQ2LyfP7iNF-tZBe99UQ-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9E0A4801585 for ; Thu, 24 Nov 2022 14:32:54 +0000 (UTC) Received: from oldenburg.str.redhat.com (unknown [10.2.16.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 37E9C4C819 for ; Thu, 24 Nov 2022 14:32:54 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH] : Make strchrnul, strcasestr, memmem available by default Date: Thu, 24 Nov 2022 15:32:52 +0100 Message-ID: <87h6yo4e3v.fsf@oldenburg.str.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-10.5 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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: Florian Weimer via Libc-alpha From: Florian Weimer Reply-To: Florian Weimer Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" FreeBSD makes them available by default, too, so there does not seem to be a reason to restrict these functions to _GNU_SOURCE. Tested on x86_64-linux-gnu. Reviewed-by: Adhemerval Zanella --- string/string.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) base-commit: a46956e65d037358161e7512a9f0fd408ea1333a diff --git a/string/string.h b/string/string.h index 54dd8344de..bfeeeb2eb4 100644 --- a/string/string.h +++ b/string/string.h @@ -274,7 +274,7 @@ extern char *strrchr (const char *__s, int __c) __THROW __attribute_pure__ __nonnull ((1)); #endif -#ifdef __USE_GNU +#ifdef __USE_MISC /* This function is similar to `strchr'. But it returns a pointer to the closing NUL byte in case C is not found in S. */ # ifdef __CORRECT_ISO_CPP_STRING_H_PROTO @@ -368,7 +368,7 @@ extern char *strtok_r (char *__restrict __s, const char *__restrict __delim, __THROW __nonnull ((2, 3)); #endif -#ifdef __USE_GNU +#ifdef __USE_MISC /* Similar to `strstr' but this function ignores the case of both strings. */ # ifdef __CORRECT_ISO_CPP_STRING_H_PROTO extern "C++" char *strcasestr (char *__haystack, const char *__needle) @@ -382,7 +382,7 @@ extern char *strcasestr (const char *__haystack, const char *__needle) # endif #endif -#ifdef __USE_GNU +#ifdef __USE_MISC /* Find the first occurrence of NEEDLE in HAYSTACK. NEEDLE is NEEDLELEN bytes long; HAYSTACK is HAYSTACKLEN bytes long. */