Import trivial changes from glibc 2.33.
Mostly style/license changes and initialization removal when the variable is a global.
This commit is contained in:
parent
c474ac2af7
commit
06a70d506f
4 changed files with 36 additions and 40 deletions
19
argp-ba.c
19
argp-ba.c
|
@ -1,26 +1,25 @@
|
||||||
/* Default definition for ARGP_PROGRAM_BUG_ADDRESS.
|
/* Default definition for ARGP_PROGRAM_BUG_ADDRESS.
|
||||||
Copyright (C) 1996, 1997, 1999, 2004 Free Software Foundation, Inc.
|
Copyright (C) 1996-2021 Free Software Foundation, Inc.
|
||||||
This file is part of the GNU C Library.
|
This file is part of the GNU C Library.
|
||||||
Written by Miles Bader <miles@gnu.ai.mit.edu>.
|
Written by Miles Bader <miles@gnu.ai.mit.edu>.
|
||||||
|
|
||||||
The GNU C Library is free software; you can redistribute it and/or
|
The GNU C Library is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU Library General Public License as
|
modify it under the terms of the GNU Lesser General Public
|
||||||
published by the Free Software Foundation; either version 2 of the
|
License as published by the Free Software Foundation; either
|
||||||
License, or (at your option) any later version.
|
version 2.1 of the License, or (at your option) any later version.
|
||||||
|
|
||||||
The GNU C Library is distributed in the hope that it will be useful,
|
The GNU C Library is distributed in the hope that it will be useful,
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
Library General Public License for more details.
|
Lesser General Public License for more details.
|
||||||
|
|
||||||
You should have received a copy of the GNU Library General Public
|
You should have received a copy of the GNU Lesser General Public
|
||||||
License along with the GNU C Library; see the file COPYING.LIB. If not,
|
License along with the GNU C Library; if not, see
|
||||||
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
<https://www.gnu.org/licenses/>. */
|
||||||
Boston, MA 02111-1307, USA. */
|
|
||||||
|
|
||||||
/* If set by the user program, it should point to string that is the
|
/* If set by the user program, it should point to string that is the
|
||||||
bug-reporting address for the program. It will be printed by argp_help if
|
bug-reporting address for the program. It will be printed by argp_help if
|
||||||
the ARGP_HELP_BUG_ADDR flag is set (as it is by various standard help
|
the ARGP_HELP_BUG_ADDR flag is set (as it is by various standard help
|
||||||
messages), embedded in a sentence that says something like `Report bugs to
|
messages), embedded in a sentence that says something like `Report bugs to
|
||||||
ADDR.'. */
|
ADDR.'. */
|
||||||
const char *argp_program_bug_address = 0;
|
const char *argp_program_bug_address;
|
||||||
|
|
17
argp-eexst.c
17
argp-eexst.c
|
@ -1,22 +1,21 @@
|
||||||
/* Default definition for ARGP_ERR_EXIT_STATUS
|
/* Default definition for ARGP_ERR_EXIT_STATUS
|
||||||
Copyright (C) 1997 Free Software Foundation, Inc.
|
Copyright (C) 1997-2021 Free Software Foundation, Inc.
|
||||||
This file is part of the GNU C Library.
|
This file is part of the GNU C Library.
|
||||||
Written by Miles Bader <miles@gnu.ai.mit.edu>.
|
Written by Miles Bader <miles@gnu.ai.mit.edu>.
|
||||||
|
|
||||||
The GNU C Library is free software; you can redistribute it and/or
|
The GNU C Library is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU Library General Public License as
|
modify it under the terms of the GNU Lesser General Public
|
||||||
published by the Free Software Foundation; either version 2 of the
|
License as published by the Free Software Foundation; either
|
||||||
License, or (at your option) any later version.
|
version 2.1 of the License, or (at your option) any later version.
|
||||||
|
|
||||||
The GNU C Library is distributed in the hope that it will be useful,
|
The GNU C Library is distributed in the hope that it will be useful,
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
Library General Public License for more details.
|
Lesser General Public License for more details.
|
||||||
|
|
||||||
You should have received a copy of the GNU Library General Public
|
You should have received a copy of the GNU Lesser General Public
|
||||||
License along with the GNU C Library; see the file COPYING.LIB. If not,
|
License along with the GNU C Library; if not, see
|
||||||
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
<https://www.gnu.org/licenses/>. */
|
||||||
Boston, MA 02111-1307, USA. */
|
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
#ifdef HAVE_CONFIG_H
|
||||||
# include <config.h>
|
# include <config.h>
|
||||||
|
|
19
argp-pv.c
19
argp-pv.c
|
@ -1,25 +1,24 @@
|
||||||
/* Default definition for ARGP_PROGRAM_VERSION.
|
/* Default definition for ARGP_PROGRAM_VERSION.
|
||||||
Copyright (C) 1996, 1997, 1999, 2004 Free Software Foundation, Inc.
|
Copyright (C) 1996-2021 Free Software Foundation, Inc.
|
||||||
This file is part of the GNU C Library.
|
This file is part of the GNU C Library.
|
||||||
Written by Miles Bader <miles@gnu.ai.mit.edu>.
|
Written by Miles Bader <miles@gnu.ai.mit.edu>.
|
||||||
|
|
||||||
The GNU C Library is free software; you can redistribute it and/or
|
The GNU C Library is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU Library General Public License as
|
modify it under the terms of the GNU Lesser General Public
|
||||||
published by the Free Software Foundation; either version 2 of the
|
License as published by the Free Software Foundation; either
|
||||||
License, or (at your option) any later version.
|
version 2.1 of the License, or (at your option) any later version.
|
||||||
|
|
||||||
The GNU C Library is distributed in the hope that it will be useful,
|
The GNU C Library is distributed in the hope that it will be useful,
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
Library General Public License for more details.
|
Lesser General Public License for more details.
|
||||||
|
|
||||||
You should have received a copy of the GNU Library General Public
|
You should have received a copy of the GNU Lesser General Public
|
||||||
License along with the GNU C Library; see the file COPYING.LIB. If not,
|
License along with the GNU C Library; if not, see
|
||||||
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
<https://www.gnu.org/licenses/>. */
|
||||||
Boston, MA 02111-1307, USA. */
|
|
||||||
|
|
||||||
/* If set by the user program to a non-zero value, then a default option
|
/* If set by the user program to a non-zero value, then a default option
|
||||||
--version is added (unless the ARGP_NO_HELP flag is used), which will
|
--version is added (unless the ARGP_NO_HELP flag is used), which will
|
||||||
print this this string followed by a newline and exit (unless the
|
print this this string followed by a newline and exit (unless the
|
||||||
ARGP_NO_EXIT flag is used). Overridden by ARGP_PROGRAM_VERSION_HOOK. */
|
ARGP_NO_EXIT flag is used). Overridden by ARGP_PROGRAM_VERSION_HOOK. */
|
||||||
const char *argp_program_version = 0;
|
const char *argp_program_version;
|
||||||
|
|
19
argp-pvh.c
19
argp-pvh.c
|
@ -1,22 +1,21 @@
|
||||||
/* Default definition for ARGP_PROGRAM_VERSION_HOOK.
|
/* Default definition for ARGP_PROGRAM_VERSION_HOOK.
|
||||||
Copyright (C) 1996, 1997, 1999, 2004 Free Software Foundation, Inc.
|
Copyright (C) 1996-2021 Free Software Foundation, Inc.
|
||||||
This file is part of the GNU C Library.
|
This file is part of the GNU C Library.
|
||||||
Written by Miles Bader <miles@gnu.ai.mit.edu>.
|
Written by Miles Bader <miles@gnu.ai.mit.edu>.
|
||||||
|
|
||||||
The GNU C Library is free software; you can redistribute it and/or
|
The GNU C Library is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU Library General Public License as
|
modify it under the terms of the GNU Lesser General Public
|
||||||
published by the Free Software Foundation; either version 2 of the
|
License as published by the Free Software Foundation; either
|
||||||
License, or (at your option) any later version.
|
version 2.1 of the License, or (at your option) any later version.
|
||||||
|
|
||||||
The GNU C Library is distributed in the hope that it will be useful,
|
The GNU C Library is distributed in the hope that it will be useful,
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
Library General Public License for more details.
|
Lesser General Public License for more details.
|
||||||
|
|
||||||
You should have received a copy of the GNU Library General Public
|
You should have received a copy of the GNU Lesser General Public
|
||||||
License along with the GNU C Library; see the file COPYING.LIB. If not,
|
License along with the GNU C Library; if not, see
|
||||||
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
<https://www.gnu.org/licenses/>. */
|
||||||
Boston, MA 02111-1307, USA. */
|
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
#ifdef HAVE_CONFIG_H
|
||||||
#include <config.h>
|
#include <config.h>
|
||||||
|
@ -29,4 +28,4 @@
|
||||||
this function with a stream to print the version to and a pointer to the
|
this function with a stream to print the version to and a pointer to the
|
||||||
current parsing state, and then exits (unless the ARGP_NO_EXIT flag is
|
current parsing state, and then exits (unless the ARGP_NO_EXIT flag is
|
||||||
used). This variable takes precedent over ARGP_PROGRAM_VERSION. */
|
used). This variable takes precedent over ARGP_PROGRAM_VERSION. */
|
||||||
void (*argp_program_version_hook) (FILE *stream, struct argp_state *state) = 0;
|
void (*argp_program_version_hook) (FILE *stream, struct argp_state *state);
|
||||||
|
|
Loading…
Reference in a new issue