Unify use of function aliases to make more compact PLT.

diff --git a/stdio-common/printf-parse.h b/stdio-common/printf-parse.h
index 45bcc3a..1f2878a 100644 (file)
--- a/stdio-common/printf-parse.h
+++ b/stdio-common/printf-parse.h
@@ -106,7 +106,7 @@ find_spec (const UCHAR_T *format, mbstate_t *ps)
 
       /* Remove any hints of a wrong encoding.  */
       ps->__count = 0;
-      if (! isascii (*format) && (len = mbrlen (format, MB_CUR_MAX, ps)) > 0)
+      if (! isascii (*format) && (len = __mbrlen (format, MB_CUR_MAX, ps)) > 0)
        format += len;
       else
        ++format;

diff --git a/stdio-common/printf-prs.c b/stdio-common/printf-prs.c
index 19869ca..c41b60e 100644 (file)
--- a/stdio-common/printf-prs.c
+++ b/stdio-common/printf-prs.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1995, 1996, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1991,1992,1995,1996,1999,2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -30,7 +30,7 @@
 # define L_(Str)       Str
 # define ISDIGIT(Ch)   isdigit (Ch)
 # define ISASCII(Ch)   isascii (Ch)
-# define MBRLEN(Cp, L, St) mbrlen (Cp, L, St)
+# define MBRLEN(Cp, L, St) __mbrlen (Cp, L, St)
 
 # ifdef USE_IN_LIBIO
 #  define PUT(F, S, N) _IO_sputn (F, S, N)

diff --git a/stdio-common/printf_fp.c b/stdio-common/printf_fp.c
index 47052d7..557a022 100644 (file)
--- a/stdio-common/printf_fp.c
+++ b/stdio-common/printf_fp.c
@@ -1186,8 +1186,8 @@ group_number (wchar_t *buf, wchar_t *bufend, unsigned int intdig_no,
     return bufend;
 
   /* Move the fractional part down.  */
-  wmemmove (buf + intdig_no + ngroups, buf + intdig_no,
-           bufend - (buf + intdig_no));
+  __wmemmove (buf + intdig_no + ngroups, buf + intdig_no,
+             bufend - (buf + intdig_no));
 
   p = buf + intdig_no + ngroups - 1;
   do

diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c
index 216ab29..3f13026 100644 (file)
--- a/stdio-common/vfprintf.c
+++ b/stdio-common/vfprintf.c
@@ -969,9 +969,10 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
       if (!left)                                                             \
        PAD (L' ');                                                           \
       if (fspec == NULL)                                                     \
-       outchar (btowc ((unsigned char) va_arg (ap, int))); /* Promoted.  */  \
+       outchar (__btowc ((unsigned char) va_arg (ap, int))); /* Promoted. */ \
       else                                                                   \
-       outchar (btowc ((unsigned char) args_value[fspec->data_arg].pa_char));\
+       outchar (__btowc ((unsigned char)                                     \
+                         args_value[fspec->data_arg].pa_char));              \
       if (left)                                                                      \
        PAD (L' ');                                                           \
       break;                                                                 \

diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c
index d618851..0731c56 100644 (file)
--- a/stdio-common/vfscanf.c
+++ b/stdio-common/vfscanf.c
@@ -80,7 +80,7 @@
                         : ((c = _IO_getwc_unlocked (s)),                     \
                            (void) (c != WEOF && ++read_in), c))
 
-#  define MEMCPY(d, s, n) wmemcpy (d, s, n)
+#  define MEMCPY(d, s, n) __wmemcpy (d, s, n)
 #  define ISSPACE(Ch)    iswspace (Ch)
 #  define ISDIGIT(Ch)    iswdigit (Ch)
 #  define ISXDIGIT(Ch)   iswxdigit (Ch)
@@ -696,7 +696,7 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
                {
                  size_t n;
 
-                 n = wcrtomb (!(flags & SUPPRESS) ? str : NULL, c, &state);
+                 n = __wcrtomb (!(flags & SUPPRESS) ? str : NULL, c, &state);
                  if (n == (size_t) -1)
                    /* No valid wide character.  */
                    input_error ();
@@ -883,7 +883,8 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
                          }
                      }
 
-                   n = wcrtomb (!(flags & SUPPRESS) ? str : NULL, c, &state);
+                   n = __wcrtomb (!(flags & SUPPRESS) ? str : NULL, c,
+                                  &state);
                    if (n == (size_t) -1)
                      encode_error ();
 
@@ -939,7 +940,7 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
                  /* We have to emit the code to get into the intial
                     state.  */
                  char buf[MB_LEN_MAX];
-                 size_t n = wcrtomb (buf, L'\0', &state);
+                 size_t n = __wcrtomb (buf, L'\0', &state);
                  if (n > 0 && (flags & MALLOC)
                      && str + n >= *strptr + strsize)
                    {
@@ -2251,7 +2252,7 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
                        }
                    }
 
-                 n = wcrtomb (!(flags & SUPPRESS) ? str : NULL, c, &state);
+                 n = __wcrtomb (!(flags & SUPPRESS) ? str : NULL, c, &state);
                  if (n == (size_t) -1)
                    encode_error ();
 
@@ -2324,7 +2325,7 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
                  /* We have to emit the code to get into the intial
                     state.  */
                  char buf[MB_LEN_MAX];
-                 size_t n = wcrtomb (buf, L'\0', &state);
+                 size_t n = __wcrtomb (buf, L'\0', &state);
                  if (n > 0 && (flags & MALLOC)
                      && str + n >= *strptr + strsize)
                    {

diff --git a/stdlib/rpmatch.c b/stdlib/rpmatch.c
index 7475a77..31fd471 100644 (file)
--- a/stdlib/rpmatch.c
+++ b/stdlib/rpmatch.c
@@ -1,7 +1,7 @@
 /* Determine whether string value is affirmation or negative response
    according to current locale's data.
    This file is part of the GNU C Library.
-   Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 2000 Free Software Foundation, Inc.
 
    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
@@ -39,17 +39,17 @@ rpmatch (response)
          if (*lastp)
            {
              /* Free the old compiled pattern.  */
-             regfree (re);
+             __regfree (re);
              *lastp = NULL;
            }
          /* Compile the pattern and cache it for future runs.  */
-         if (regcomp (re, pattern, REG_EXTENDED) != 0)
+         if (__regcomp (re, pattern, REG_EXTENDED) != 0)
            return -1;
          *lastp = pattern;
        }
 
       /* Try the pattern.  */
-      return regexec (re, response, 0, NULL, 0) == 0 ? match : nomatch;
+      return __regexec (re, response, 0, NULL, 0) == 0 ? match : nomatch;
     }
 
   /* We cache the response patterns and compiled regexps here.  */

diff --git a/sunrpc/create_xid.c b/sunrpc/create_xid.c
index 15fb367..218b704 100644 (file)
--- a/sunrpc/create_xid.c
+++ b/sunrpc/create_xid.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 1998 Free Software Foundation, Inc.
+/* Copyright (c) 1998, 2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1998.
 
@@ -41,7 +41,7 @@ _create_xid (void)
       struct timeval now;
 
       __gettimeofday (&now, (struct timezone *) 0);
-      srand48_r (now.tv_sec ^ now.tv_usec, &__rpc_lrand48_data);
+      __srand48_r (now.tv_sec ^ now.tv_usec, &__rpc_lrand48_data);
       is_initialized = 1;
     }
 

diff --git a/sunrpc/key_call.c b/sunrpc/key_call.c
index 895e5a3..6e9d4a3 100644 (file)
--- a/sunrpc/key_call.c
+++ b/sunrpc/key_call.c
@@ -398,7 +398,7 @@ getkeyserv_handle (int vers)
     {
       /* if other side closed socket, build handle again */
       clnt_control (kcp->client, CLGET_FD, (char *)&fd);
-      if (getpeername (fd,(struct sockaddr *)&name,&namelen) == -1)
+      if (__getpeername (fd,(struct sockaddr *)&name,&namelen) == -1)
        {
          auth_destroy (kcp->client->cl_auth);
          clnt_destroy (kcp->client);

diff --git a/sysdeps/generic/setrlimit64.c b/sysdeps/generic/setrlimit64.c
index 1e55de3..d1dca59 100644 (file)
--- a/sysdeps/generic/setrlimit64.c
+++ b/sysdeps/generic/setrlimit64.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1991,1995,1996,1997,1998,2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -39,5 +39,5 @@ setrlimit64 (resource, rlimits)
   else
     rlimits32.rlim_max = rlimits->rlim_max;
 
-  return setrlimit (resource, &rlimits32);
+  return __setrlimit (resource, &rlimits32);
 }

diff --git a/sysdeps/generic/utmp_file.c b/sysdeps/generic/utmp_file.c
index 74e91fb..2f172ff 100644 (file)
--- a/sysdeps/generic/utmp_file.c
+++ b/sysdeps/generic/utmp_file.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>
    and Paul Janzen <pcj@primenet.com>, 1996.
@@ -133,7 +133,7 @@ setutent_file (void)
        result = __fcntl (file_fd, F_SETFD, result | FD_CLOEXEC);
       if (result == -1)
        {
-         close (file_fd);
+         __close (file_fd);
          return 0;
        }
     }

diff --git a/sysdeps/generic/vlimit.c b/sysdeps/generic/vlimit.c
index 68addbc..47871bc 100644 (file)
--- a/sysdeps/generic/vlimit.c
+++ b/sysdeps/generic/vlimit.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1996, 1997, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -43,7 +43,7 @@ vlimit (resource, value)
        return -1;
 
       lims.rlim_cur = value;
-      return setrlimit (rlimit_res, &lims);
+      return __setrlimit (rlimit_res, &lims);
     }
 
   __set_errno (EINVAL);

diff --git a/sysdeps/posix/posix_fallocate.c b/sysdeps/posix/posix_fallocate.c
index cd0f961..46ce06f 100644 (file)
--- a/sysdeps/posix/posix_fallocate.c
+++ b/sysdeps/posix/posix_fallocate.c
@@ -61,7 +61,7 @@ posix_fallocate (int fd, __off_t offset, size_t len)
     {
       len -= step;
 
-      if (pwrite (fd, "", 1, offset) != 1)
+      if (__pwrite (fd, "", 1, offset) != 1)
        return errno;
 
       offset += step;

diff --git a/sysdeps/posix/posix_fallocate64.c b/sysdeps/posix/posix_fallocate64.c
index 539244d..4be48e7 100644 (file)
--- a/sysdeps/posix/posix_fallocate64.c
+++ b/sysdeps/posix/posix_fallocate64.c
@@ -61,7 +61,7 @@ posix_fallocate64 (int fd, __off64_t offset, size_t len)
     {
       len -= step;
 
-      if (pwrite64 (fd, "", 1, offset) != 1)
+      if (__pwrite64 (fd, "", 1, offset) != 1)
        return errno;
 
       offset += step;

diff --git a/sysdeps/posix/sigpause.c b/sysdeps/posix/sigpause.c
index 793ec89..4832c6a 100644 (file)
--- a/sysdeps/posix/sigpause.c
+++ b/sysdeps/posix/sigpause.c
@@ -35,7 +35,7 @@ __sigpause (sig_or_mask, is_sig)
       /* The modern X/Open implementation is requested.  */
       if (__sigprocmask (0, NULL, &set) < 0
          /* Yes, we call `sigdelset' and not `__sigdelset'.  */
-         || sigdelset (&set, sig_or_mask) < 0)
+         || __sigdelset (&set, sig_or_mask) < 0)
        return -1;
     }
   else

diff --git a/sysdeps/posix/sigset.c b/sysdeps/posix/sigset.c
index e234d8a..4fea94f 100644 (file)
--- a/sysdeps/posix/sigset.c
+++ b/sysdeps/posix/sigset.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -40,7 +40,7 @@ sigset (sig, disp)
        return SIG_ERR;
 
       /* Add the specified signal.  */
-      if (sigaddset (&set, sig) < 0)
+      if (__sigaddset (&set, sig) < 0)
        return SIG_ERR;
 
       /* Add the signal set to the current signal mask.  */
@@ -70,7 +70,7 @@ sigset (sig, disp)
     return SIG_ERR;
 
   /* Add the specified signal.  */
-  if (sigaddset (&set, sig) < 0)
+  if (__sigaddset (&set, sig) < 0)
     return SIG_ERR;
 
   /* Remove the signal set from the current signal mask.  */

diff --git a/sysdeps/unix/bsd/ualarm.c b/sysdeps/unix/bsd/ualarm.c
index 5fd4d79..b280f5b 100644 (file)
--- a/sysdeps/unix/bsd/ualarm.c
+++ b/sysdeps/unix/bsd/ualarm.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1997, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1997, 1999, 2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -36,7 +36,7 @@ ualarm (value, interval)
   timer.it_interval.tv_sec = 0;
   timer.it_interval.tv_usec = interval;
 
-  if (setitimer (ITIMER_REAL, &timer, &otimer) < 0)
+  if (__setitimer (ITIMER_REAL, &timer, &otimer) < 0)
     return -1;
 
   return (otimer.it_value.tv_sec * 1000000) + otimer.it_value.tv_usec;

diff --git a/sysdeps/unix/grantpt.c b/sysdeps/unix/grantpt.c
index df155eb..1ac542f 100644 (file)
--- a/sysdeps/unix/grantpt.c
+++ b/sysdeps/unix/grantpt.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Zack Weinberg <zack@rabi.phys.columbia.edu>, 1998.
 
@@ -48,7 +48,7 @@ pts_name (int fd, char **pts, size_t buf_len)
 
       if (buf_len)
        {
-         rv = ptsname_r (fd, buf, buf_len);
+         rv = __ptsname_r (fd, buf, buf_len);
 
          if (rv != 0 || memchr (buf, '\0', buf_len))
            /* We either got an error, or we succeeded and the
@@ -126,7 +126,7 @@ grantpt (int fd)
        Try a moderate value.  */
     grbuflen = 1024;
   grtmpbuf = (char *) __alloca (grbuflen);
-  getgrnam_r (TTY_GROUP, &grbuf, grtmpbuf, grbuflen, &p);
+  __getgrnam_r (TTY_GROUP, &grbuf, grtmpbuf, grbuflen, &p);
   gid = p ? p->gr_gid : __getgid ();
 
   /* Make sure the group of the device is that special group.  */
@@ -157,7 +157,7 @@ grantpt (int fd)
     {
       /* Disable core dumps.  */
       struct rlimit rl = { 0, 0 };
-      setrlimit (RLIMIT_CORE, &rl);
+      __setrlimit (RLIMIT_CORE, &rl);
 
       /* We pase the master pseudo terminal as file descriptor PTY_FILENO.  */
       if (fd != PTY_FILENO)

diff --git a/sysdeps/unix/sysv/linux/dl-origin.c b/sysdeps/unix/sysv/linux/dl-origin.c
index e425467..6ee0ed2 100644 (file)
--- a/sysdeps/unix/sysv/linux/dl-origin.c
+++ b/sysdeps/unix/sysv/linux/dl-origin.c
@@ -37,7 +37,7 @@ _dl_get_origin (void)
   char linkval[PATH_MAX];
   char *result;
 
-  if (readlink ("/proc/self/exe", linkval, PATH_MAX) != -1
+  if (__readlink ("/proc/self/exe", linkval, PATH_MAX) != -1
       && linkval[0] != '[')
     {
       /* We can use this value.  */

diff --git a/sysdeps/unix/sysv/linux/getloadavg.c b/sysdeps/unix/sysv/linux/getloadavg.c
index 1612ad2..909920e 100644 (file)
--- a/sysdeps/unix/sysv/linux/getloadavg.c
+++ b/sysdeps/unix/sysv/linux/getloadavg.c
@@ -1,5 +1,5 @@
 /* Get system load averages.  Linux (/proc/loadavg) version.
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -42,7 +42,7 @@ getloadavg (double loadavg[], int nelem)
       int i;
 
       nread = __read (fd, buf, sizeof buf - 1);
-      close (fd);
+      __close (fd);
       if (nread < 0)
        return -1;
       buf[nread - 1] = '\0';

diff --git a/sysdeps/unix/sysv/linux/ttyname.c b/sysdeps/unix/sysv/linux/ttyname.c
index 0973925..81149ff 100644 (file)
--- a/sysdeps/unix/sysv/linux/ttyname.c
+++ b/sysdeps/unix/sysv/linux/ttyname.c
@@ -47,14 +47,14 @@ getttyname (const char *dev, dev_t mydev, ino_t myino, int save, int *dostat)
   struct dirent *d;
   size_t devlen = strlen (dev) + 1;
 
-  dirstream = opendir (dev);
+  dirstream = __opendir (dev);
   if (dirstream == NULL)
     {
       *dostat = -1;
       return NULL;
     }
 
-  while ((d = readdir (dirstream)) != NULL)
+  while ((d = __readdir (dirstream)) != NULL)
     if (((ino_t) d->d_fileno == myino || *dostat)
        && strcmp (d->d_name, "stdin")
        && strcmp (d->d_name, "stdout")

diff --git a/sysdeps/unix/sysv/linux/ulimit.c b/sysdeps/unix/sysv/linux/ulimit.c
index ec03374..dc0ba72 100644 (file)
--- a/sysdeps/unix/sysv/linux/ulimit.c
+++ b/sysdeps/unix/sysv/linux/ulimit.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 92, 94, 95, 96, 97, 98 Free Software Foundation, Inc.
+/* Copyright (C) 1991,92,94,95,96,97,98,2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -58,7 +58,7 @@ __ulimit (int cmd, ...)
        limit.rlim_cur = newlimit * 512;
        limit.rlim_max = newlimit * 512;
 
-       result = setrlimit (RLIMIT_FSIZE, &limit);
+       result = __setrlimit (RLIMIT_FSIZE, &limit);
       }
       break;
 

diff --git a/time/strftime.c b/time/strftime.c
index 7771880..c8334d9 100644 (file)
--- a/time/strftime.c
+++ b/time/strftime.c
@@ -92,8 +92,8 @@ extern char *tzname[];
 # define L_(Str) L##Str
 # define NLW(Sym) _NL_W##Sym
 
-# define MEMCPY(d, s, n) wmemcpy (d, s, n)
-# define STRLEN(s) wcslen (s)
+# define MEMCPY(d, s, n) __wmemcpy (d, s, n)
+# define STRLEN(s) __wcslen (s)
 
 #else
 # define CHAR_T char
@@ -834,7 +834,7 @@ my_strftime (s, maxsize, format, tp ut_argument)
              if (era)
                {
 # ifdef COMPILE_WIDE
-                 size_t len = wcslen (era->era_wname);
+                 size_t len = __wcslen (era->era_wname);
                  cpy (len, era->era_wname);
 # else
                  size_t len = strlen (era->era_name);

diff --git a/wcsmbs/wcscoll.c b/wcsmbs/wcscoll.c
index 1dfe939..6fbd13d 100644 (file)
--- a/wcsmbs/wcscoll.c
+++ b/wcsmbs/wcscoll.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
@@ -27,7 +27,7 @@
 # define STRCOLL wcscoll
 #endif
 #define STRCMP wcscmp
-#define STRLEN wcslen
+#define STRLEN __wcslen
 #define WEIGHT_H "../locale/weightwc.h"
 #define SUFFIX WC
 #define L(arg) L##arg

diff --git a/wcsmbs/wcsxfrm.c b/wcsmbs/wcsxfrm.c
index c515657..d4ac133 100644 (file)
--- a/wcsmbs/wcsxfrm.c
+++ b/wcsmbs/wcsxfrm.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
@@ -27,7 +27,7 @@
 # define STRXFRM wcsxfrm
 #endif
 #define STRCMP wcscmp
-#define STRLEN wcslen
+#define STRLEN __wcslen
 #define STPNCPY __wcpncpy
 #define WEIGHT_H "../locale/weightwc.h"
 #define SUFFIX WC