From patchwork Wed Jun 22 14:42:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guilherme Janczak X-Patchwork-Id: 55281 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 DF7BF3856DC8 for ; Wed, 22 Jun 2022 14:43:07 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DF7BF3856DC8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1655908987; bh=dkW1W0qw5AL0DgDWw8GvHogsn22B5GeluuTerTd2EyQ=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=tdBDTuFC/BL8dXC34IEHFzVmXNZ5CegXH3+O8c8RzVO5JnLL1Ni2v0YZGvFWc2duy 5SRKs8ZUS0CS8RCm397XtzUtkhT9vj8s2V/qNOYFUiccnshYu6RqUjTypWGl8T4ca1 nnruj+uDmW3JZYQh9+WNdW8J1X/BqVb4qs1bgBS0= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from forward103j.mail.yandex.net (forward103j.mail.yandex.net [5.45.198.246]) by sourceware.org (Postfix) with ESMTPS id 42D8D385702E for ; Wed, 22 Jun 2022 14:42:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 42D8D385702E Received: from forward101q.mail.yandex.net (forward101q.mail.yandex.net [IPv6:2a02:6b8:c0e:4b:0:640:4012:bb98]) by forward103j.mail.yandex.net (Yandex) with ESMTP id 3B2CC1074E3 for ; Wed, 22 Jun 2022 17:42:44 +0300 (MSK) Received: from vla5-9129714d0767.qloud-c.yandex.net (vla5-9129714d0767.qloud-c.yandex.net [IPv6:2a02:6b8:c18:3609:0:640:9129:714d]) by forward101q.mail.yandex.net (Yandex) with ESMTP id 3929813E806E8 for ; Wed, 22 Jun 2022 17:42:44 +0300 (MSK) Received: from vla3-178a3f795968.qloud-c.yandex.net (vla3-178a3f795968.qloud-c.yandex.net [2a02:6b8:c15:2584:0:640:178a:3f79]) by vla5-9129714d0767.qloud-c.yandex.net (mxback/Yandex) with ESMTP id P2VxbeuGz2-gifeR2MX; Wed, 22 Jun 2022 17:42:44 +0300 X-Yandex-Fwd: 2 Received: by vla3-178a3f795968.qloud-c.yandex.net (smtp/Yandex) with ESMTPSA id BLJynrHbMT-ggMad0RT; Wed, 22 Jun 2022 17:42:43 +0300 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client certificate not present) Date: Wed, 22 Jun 2022 14:42:39 +0000 To: libc-alpha@sourceware.org Subject: [PATCH] argp: Remove old includes in !_LIBC case Message-ID: <20220622144239.uynpid2tx7mmfm7g@yandex.com> MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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: Guilherme Janczak via Libc-alpha From: Guilherme Janczak Reply-To: Guilherme Janczak Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" It seems these days there are 3 argp downstreams: argp-standalone: https://github.com/argp-standalone/argp-standalone/ gnulib: https://git.savannah.gnu.org/gitweb/?p=gnulib.git uClibc-ng: https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/ I'm maintaining argp-standalone, and I noticed the compatibility code in glibc's argp has been rotting for 19 years, so I'd like to start cleaning it up to make it easier on the downstreams. -- >8 -- The headers mempcpy.h, strcase.h, strchrnul.h, and strndup.h are included if not building argp for glibc. Commit c5af724c0b214a517f8558887f7a70efcfa2c813 added them in 2003 for gnulib, but gnulib's current master patches them out: https://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob;f=lib/argp-namefrob.h;h=9c82ac79c215540f986c3e04398edba3ba1b7234;hb=HEAD --- argp/argp-namefrob.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/argp/argp-namefrob.h b/argp/argp-namefrob.h index 2b6a4f1ea8..baed8f1999 100644 --- a/argp/argp-namefrob.h +++ b/argp/argp-namefrob.h @@ -76,11 +76,6 @@ #undef __argp_fmtstream_wmargin #define __argp_fmtstream_wmargin argp_fmtstream_wmargin -#include "mempcpy.h" -#include "strcase.h" -#include "strchrnul.h" -#include "strndup.h" - /* normal libc functions we call */ #undef __flockfile #define __flockfile flockfile