aboutsummaryrefslogtreecommitdiff
path: root/argp/argp-help.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-08-21 04:18:25 +0000
committerUlrich Drepper <drepper@redhat.com>2000-08-21 04:18:25 +0000
commit4aebaa6bd906383aca1b7a5e1251b0d1652f9f7c (patch)
tree046f117d02a6ce4b2dd47c26270592f9ce9be5e0 /argp/argp-help.c
parenta785f6c56e7be1b07ee099ee3982e84d8b538ef4 (diff)
downloadglibc-4aebaa6bd906383aca1b7a5e1251b0d1652f9f7c.tar
glibc-4aebaa6bd906383aca1b7a5e1251b0d1652f9f7c.tar.gz
glibc-4aebaa6bd906383aca1b7a5e1251b0d1652f9f7c.tar.bz2
glibc-4aebaa6bd906383aca1b7a5e1251b0d1652f9f7c.zip
Update.
* argp/argp-help.c: Unify use of function aliases to make more compact PLT. * include/libintl.h: Likewise. * inet/rcmd.c: Likewise. * intl/dcigettext.c: Likewise. * libio/iofputws.c: Likewise. * libio/iofputws_u.c: Likewise. * libio/iogetwline.c: Likewise. * libio/swprintf.c: Likewise. * malloc/malloc.c: Likewise. * nss/digits_dots.c: Likewise. * posix/fnmatch.c: Likewise. * posix/spawn_faction_addclose.c: Likewise. * posix/spawn_faction_adddup2.c: Likewise. * posix/spawn_faction_addopen.c: Likewise. * posix/spawni.c: Likewise. * posix/wordexp.c: Likewise. * posix/spawni.c: Likewise. * resolv/res_hconf.c: Likewise. * resolv/res_init.c: Likewise. * shadow/lckpwdf.c: Likewise. * signal/sighold.c: Likewise. * signal/sigrelse.c: Likewise. * stdio-common/printf-parse.h: Likewise. * stdio-common/printf-prs.c: Likewise. * stdio-common/printf_fp.c: Likewise. * stdio-common/vfprintf.c: Likewise. * stdio-common/vfscanf.c: Likewise. * stdlib/rpmatch.c: Likewise. * sunrpc/create_xid.c: Likewise. * sunrpc/key_call.c: Likewise. * sysdeps/generic/setrlimit64.c: Likewise. * sysdeps/generic/utmp_file.c: Likewise. * sysdeps/generic/vlimit.c: Likewise. * sysdeps/posix/posix_fallocate.c: Likewise. * sysdeps/posix/posix_fallocate64.c: Likewise. * sysdeps/posix/sigpause.c: Likewise. * sysdeps/posix/sigset.c: Likewise. * sysdeps/unix/grantpt.c: Likewise. * sysdeps/unix/bsd/ualarm.c: Likewise. * sysdeps/unix/sysv/linux/dl-origin.c: Likewise. * sysdeps/unix/sysv/linux/getloadavg.c: Likewise. * sysdeps/unix/sysv/linux/ttyname.c: Likewise. * sysdeps/unix/sysv/linux/ulimit.c: Likewise. * time/strftime.c: Likewise. * wcsmbs/wcscoll.c: Likewise. * wcsmbs/wcsxfrm.c: Likewise. * sysdeps/powerpc/fpu_control.h (_FPU_GETCW): Allow gcc to generate postinc/predec instruction.
Diffstat (limited to 'argp/argp-help.c')
-rw-r--r--argp/argp-help.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/argp/argp-help.c b/argp/argp-help.c
index 560fe5237f..394a4add2f 100644
--- a/argp/argp-help.c
+++ b/argp/argp-help.c
@@ -1,5 +1,5 @@
/* Hierarchial argument parsing help output
- Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1995,1996,1997,1998,1999,2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Miles Bader <miles@gnu.ai.mit.edu>.
@@ -1521,7 +1521,7 @@ _help (const struct argp *argp, const struct argp_state *state, FILE *stream,
if (! stream)
return;
- flockfile (stream);
+ __flockfile (stream);
if (! uparams.valid)
fill_in_uparams (state);
@@ -1529,7 +1529,7 @@ _help (const struct argp *argp, const struct argp_state *state, FILE *stream,
fs = __argp_make_fmtstream (stream, 0, uparams.rmargin, 0);
if (! fs)
{
- funlockfile (stream);
+ __funlockfile (stream);
return;
}
@@ -1637,7 +1637,7 @@ Try `%s --help' or `%s --usage' for more information.\n"),
anything = 1;
}
- funlockfile (stream);
+ __funlockfile (stream);
if (hol)
hol_free (hol);
@@ -1696,7 +1696,7 @@ __argp_error (const struct argp_state *state, const char *fmt, ...)
{
va_list ap;
- flockfile (stream);
+ __flockfile (stream);
fputs_unlocked (state ? state->name : program_invocation_short_name,
stream);
@@ -1711,7 +1711,7 @@ __argp_error (const struct argp_state *state, const char *fmt, ...)
__argp_state_help (state, stream, ARGP_HELP_STD_ERR);
- funlockfile (stream);
+ __funlockfile (stream);
}
}
}
@@ -1737,7 +1737,7 @@ __argp_failure (const struct argp_state *state, int status, int errnum,
if (stream)
{
- flockfile (stream);
+ __flockfile (stream);
fputs_unlocked (state ? state->name : program_invocation_short_name,
stream);
@@ -1763,7 +1763,7 @@ __argp_failure (const struct argp_state *state, int status, int errnum,
putc_unlocked ('\n', stream);
- funlockfile (stream);
+ __funlockfile (stream);
if (status && (!state || !(state->flags & ARGP_NO_EXIT)))
exit (status);