diff options
47 files changed, 193 insertions, 139 deletions
@@ -1,9 +1,57 @@ 2000-08-20 Ulrich Drepper <drepper@redhat.com> + * 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. + * time/tst-getdate.c (main): Make error messages more human readable. - * sysdeps/powerpc/fpu_control.h (_FPU_GETCW): Allow gcc to generic - postinc/postdec instruction. + * sysdeps/powerpc/fpu_control.h (_FPU_GETCW): Allow gcc to generate + postinc/predec instruction. (_FPU_SETCW): Likewise. Patch by Franz Sirl <Franz.Sirl-kernel@lauterbach.com>. 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); diff --git a/include/libintl.h b/include/libintl.h index 2da639d40d..0f77658a0e 100644 --- a/include/libintl.h +++ b/include/libintl.h @@ -22,13 +22,7 @@ extern const char _libc_intl_domainname[]; # define N_(msgid) msgid # undef _ -# ifdef dgettext /* This is defined as an optimizing macro, so use it. */ -# define _(msgid) dgettext (_libc_intl_domainname, (msgid)) -# else -/* Be sure to use only the __ name when `dgettext' is a plain function - instead of an optimizing macro. */ -# define _(msgid) __dgettext (_libc_intl_domainname, (msgid)) -# endif +# define _(msgid) __dcgettext (_libc_intl_domainname, (msgid), LC_MESSAGES) #endif diff --git a/inet/rcmd.c b/inet/rcmd.c index 758f6c953b..6c01f96811 100644 --- a/inet/rcmd.c +++ b/inet/rcmd.c @@ -129,7 +129,7 @@ rcmd_af(ahost, rport, locuser, remuser, cmd, fd2p, af) hints.ai_flags = AI_CANONNAME; hints.ai_family = af; hints.ai_socktype = SOCK_STREAM; - (void)snprintf(num, sizeof(num), "%d", ntohs(rport)); + (void)__snprintf(num, sizeof(num), "%d", ntohs(rport)); error = getaddrinfo(*ahost, num, &hints, &res); if (error) { fprintf(stderr, "rcmd: getaddrinfo: %s\n", @@ -191,7 +191,7 @@ rcmd_af(ahost, rport, locuser, remuser, cmd, fd2p, af) continue; } if (refused && timo <= 16) { - (void)sleep(timo); + (void)__sleep(timo); timo *= 2; ai = res; refused = 0; @@ -327,7 +327,7 @@ rresvport_af(alport, family) __set_errno (EAFNOSUPPORT); return -1; } - s = socket(family, SOCK_STREAM, 0); + s = __socket(family, SOCK_STREAM, 0); if (s < 0) return -1; diff --git a/intl/dcigettext.c b/intl/dcigettext.c index fcbc130a26..c69bb19bc8 100644 --- a/intl/dcigettext.c +++ b/intl/dcigettext.c @@ -129,6 +129,7 @@ void free (); # ifndef stpcpy # define stpcpy __stpcpy # endif +# define tfind __tfind #else # if !defined HAVE_GETCWD char *getwd (); diff --git a/intl/plural.c b/intl/plural.c index 73716c4cd3..e34fb8ee52 100644 --- a/intl/plural.c +++ b/intl/plural.c @@ -39,16 +39,15 @@ #include "gettext.h" #include "gettextP.h" -#define YYDEBUG 1 #define YYLEX_PARAM &((struct parse_args *) arg)->cp #define YYPARSE_PARAM arg -#line 33 "plural.y" +#line 32 "plural.y" typedef union { unsigned long int num; struct expression *exp; } YYSTYPE; -#line 38 "plural.y" +#line 37 "plural.y" /* Prototypes for local functions. */ static struct expression *new_exp (enum operator op, int n, ...); @@ -118,8 +117,8 @@ static const short yyrhs[] = { 19, #if YYDEBUG != 0 static const short yyrline[] = { 0, - 56, 62, 67, 72, 77, 82, 87, 92, 97, 102, - 107, 112, 117, 123 + 55, 61, 66, 71, 76, 81, 86, 91, 96, 101, + 106, 111, 116, 122 }; #endif @@ -735,90 +734,90 @@ yyreduce: switch (yyn) { case 1: -#line 57 "plural.y" +#line 56 "plural.y" { ((struct parse_args *) arg)->res = yyvsp[0].exp; ; break;} case 2: -#line 63 "plural.y" +#line 62 "plural.y" { if ((yyval.exp = new_exp (qmop, 3, yyvsp[-4].exp, yyvsp[-2].exp, yyvsp[0].exp)) == NULL) YYABORT ; break;} case 3: -#line 68 "plural.y" +#line 67 "plural.y" { if ((yyval.exp = new_exp (lor, 2, yyvsp[-2].exp, yyvsp[0].exp)) == NULL) YYABORT ; break;} case 4: -#line 73 "plural.y" +#line 72 "plural.y" { if ((yyval.exp = new_exp (land, 2, yyvsp[-2].exp, yyvsp[0].exp)) == NULL) YYABORT ; break;} case 5: -#line 78 "plural.y" +#line 77 "plural.y" { if ((yyval.exp = new_exp (equal, 2, yyvsp[-2].exp, yyvsp[0].exp)) == NULL) YYABORT ; break;} case 6: -#line 83 "plural.y" +#line 82 "plural.y" { if ((yyval.exp = new_exp (not_equal, 2, yyvsp[-2].exp, yyvsp[0].exp)) == NULL) YYABORT ; break;} case 7: -#line 88 "plural.y" +#line 87 "plural.y" { if ((yyval.exp = new_exp (plus, 2, yyvsp[-2].exp, yyvsp[0].exp)) == NULL) YYABORT ; break;} case 8: -#line 93 "plural.y" +#line 92 "plural.y" { if ((yyval.exp = new_exp (minus, 2, yyvsp[-2].exp, yyvsp[0].exp)) == NULL) YYABORT ; break;} case 9: -#line 98 "plural.y" +#line 97 "plural.y" { if ((yyval.exp = new_exp (mult, 2, yyvsp[-2].exp, yyvsp[0].exp)) == NULL) YYABORT ; break;} case 10: -#line 103 "plural.y" +#line 102 "plural.y" { if ((yyval.exp = new_exp (divide, 2, yyvsp[-2].exp, yyvsp[0].exp)) == NULL) YYABORT ; break;} case 11: -#line 108 "plural.y" +#line 107 "plural.y" { if ((yyval.exp = new_exp (module, 2, yyvsp[-2].exp, yyvsp[0].exp)) == NULL) YYABORT ; break;} case 12: -#line 113 "plural.y" +#line 112 "plural.y" { if ((yyval.exp = new_exp (var, 0)) == NULL) YYABORT ; break;} case 13: -#line 118 "plural.y" +#line 117 "plural.y" { if ((yyval.exp = new_exp (num, 0)) == NULL) YYABORT; @@ -826,7 +825,7 @@ case 13: ; break;} case 14: -#line 124 "plural.y" +#line 123 "plural.y" { yyval.exp = yyvsp[-1].exp ; @@ -1053,7 +1052,7 @@ yyerrhandle: } return 1; } -#line 129 "plural.y" +#line 128 "plural.y" static struct expression * @@ -1134,8 +1133,6 @@ yylex (YYSTYPE *lval, const char **pexp) const char *exp = *pexp; int result; - yydebug = 1; - while (1) { if (exp[0] == '\\' && exp[1] == '\n') diff --git a/libio/iofputws.c b/libio/iofputws.c index daad1b9836..db8ce05897 100644 --- a/libio/iofputws.c +++ b/libio/iofputws.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993, 1996, 1997, 1998, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1993,1996,1997,1998,1999,2000 Free Software Foundation, Inc. This file is part of the GNU IO Library. This library is free software; you can redistribute it and/or @@ -31,7 +31,7 @@ fputws (str, fp) const wchar_t *str; _IO_FILE *fp; { - _IO_size_t len = wcslen (str); + _IO_size_t len = __wcslen (str); int result = EOF; CHECK_FILE (fp, EOF); _IO_cleanup_region_start ((void (*) __P ((void *))) _IO_funlockfile, fp); diff --git a/libio/iofputws_u.c b/libio/iofputws_u.c index a5749cdbec..6219d96976 100644 --- a/libio/iofputws_u.c +++ b/libio/iofputws_u.c @@ -1,4 +1,4 @@ |