aboutsummaryrefslogtreecommitdiff
path: root/locale/loadarchive.c
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2002-08-12 02:02:20 +0000
committerRoland McGrath <roland@gnu.org>2002-08-12 02:02:20 +0000
commit7a8bdff02c8bc80d5068eadf83302595d11f46d4 (patch)
tree4f55261ddbc4238511bf0a8f3a0d935407e56609 /locale/loadarchive.c
parenta83f1ae4c84302888c9fee52502dff8e8bdac4e5 (diff)
downloadglibc-7a8bdff02c8bc80d5068eadf83302595d11f46d4.tar
glibc-7a8bdff02c8bc80d5068eadf83302595d11f46d4.tar.gz
glibc-7a8bdff02c8bc80d5068eadf83302595d11f46d4.tar.bz2
glibc-7a8bdff02c8bc80d5068eadf83302595d11f46d4.zip
* sunrpc/svc_authux.c (_svcauth_unix): Remove spurious printf (ugh!).
* sysdeps/i386/bits/byteswap.h (__bswap_16, __bswap_32, __bswap_64): Evaluate argument exactly once. Remove __volatile__ from asm's. * include/unistd.h: Use libc_hidden_proto for getdomainname and getlogin_r. * sysdeps/generic/getdomain.c: Add libc_hidden_def. * sysdeps/mach/hurd/getdomain.c: Likewise. * sysdeps/unix/getlogin_r.c: Likewise. * sysdeps/mach/hurd/getlogin_r.c: Likewise. * sysdeps/generic/getlogin_r.c: Likewise. * include/rpc/auth_des.h: Use libc_hidden_proto for rtime. * sunrpc/rtime.c: Add libc_hidden_def. * include/string.h: Use libc_hidden_proto for basename. * string/basename.c [_LIBC]: Add libc_hidden_def. * sysdeps/unix/sysv/linux/opensock.c (__opensock): socket -> __socket. * locale/loadarchive.c: munmap -> __munmap throughout. * include/netdb.h: Use libc_hidden_proto for gai_strerror. * sysdeps/posix/gai_strerror.c: Add libc_hidden_def. * sysdeps/generic/gai_strerror.c: Likewise.
Diffstat (limited to 'locale/loadarchive.c')
-rw-r--r--locale/loadarchive.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/locale/loadarchive.c b/locale/loadarchive.c
index ad06f12438..52f58be839 100644
--- a/locale/loadarchive.c
+++ b/locale/loadarchive.c
@@ -205,7 +205,7 @@ _nl_load_locale_from_archive (int category, const char **namep)
if (calculate_head_size ((const struct locarhead *) result)
> archive_stat.st_size)
{
- (void) munmap (result, archive_stat.st_size);
+ (void) __munmap (result, archive_stat.st_size);
goto close_and_out;
}
__close (fd);
@@ -389,7 +389,7 @@ _nl_load_locale_from_archive (int category, const char **namep)
newp = (struct archmapped *) malloc (sizeof (struct archmapped));
if (newp == NULL)
{
- (void) munmap (addr, to - from);
+ (void) __munmap (addr, to - from);
return NULL;
}
@@ -473,13 +473,13 @@ _nl_archive_subfreeres (void)
assert (archmapped == &headmap);
archmapped = NULL;
- (void) munmap (headmap.ptr, headmap.len);
+ (void) __munmap (headmap.ptr, headmap.len);
am = headmap.next;
while (am != NULL)
{
struct archmapped *dead = am;
am = am->next;
- (void) munmap (dead->ptr, dead->len);
+ (void) __munmap (dead->ptr, dead->len);
free (dead);
}
}