diff mbox series

argp: Remove old includes in !_LIBC case

Message ID 20220622144239.uynpid2tx7mmfm7g@yandex.com
State Committed
Commit bb1bd9ec0e126a918b58094f6977e2c5f9ac8e9f
Headers
Series argp: Remove old includes in !_LIBC case |

Checks

Context Check Description
dj/TryBot-apply_patch success Patch applied to master at the time it was sent
dj/TryBot-32bit success Build for i686

Commit Message

Guilherme Janczak June 22, 2022, 2:42 p.m. UTC 
  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(-)

Comments

Paul Eggert June 22, 2022, 3:39 p.m. UTC | #1 
This patch looks fine on its own; thanks.

However, it sounds like you're thinking of several other changes in the 
argp area, so we should get an idea of where this is headed. Among other 
things, for changes propagated to Gnulib we'll need the usual 
traditional copyright papers - assuming you're interested in doing that 
I can send you the copyright forms.
Guilherme Janczak June 22, 2022, 5:23 p.m. UTC | #2 
On Wed, Jun 22, 2022 at 10:39:43AM -0500, Paul Eggert wrote:
> for changes propagated to Gnulib we'll need the usual traditional copyright
> papers - assuming you're interested in doing that I can send you the
> copyright forms.
Please send me the papers, I intend to send more patches, so it would be
best to get copyright out of the way early.
Florian Weimer July 4, 2022, 1:29 p.m. UTC | #3 
* Guilherme Janczak via 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

Thanks, pushed.

Florian
diff mbox series

Patch

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