summary refs log tree commit diff
path: root/catgets/open_catalog.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2002-02-27 18:11:27 +0000
committerUlrich Drepper <drepper@redhat.com>2002-02-27 18:11:27 +0000
commit8e0998473ff6ac97599f4de0a81257b773930321 (patch)
tree0efa76bc8b2ad11d05ec2b309ebf421995c4ce55 /catgets/open_catalog.c
parentb863ccd7c053a4d4b79b37a91679a01fa098b849 (diff)
downloadglibc-8e0998473ff6ac97599f4de0a81257b773930321.tar.gz
glibc-8e0998473ff6ac97599f4de0a81257b773930321.tar.xz
glibc-8e0998473ff6ac97599f4de0a81257b773930321.zip
Update.
2002-02-27  Jakub Jelinek  <jakub@redhat.com>

	* sysdeps/alpha/dl-machine.h (elf_machine_load_address, RTLD_START):
	Work around an Alpha gas bug.

2002-02-27  Ulrich Drepper  <drepper@redhat.com>

	* catgets/open_catalog.c (__open_catalog): Fix typo in code which
	uses read to load the catalog.
	Patch by Andy Isaacson <adi@unlimitedscale.com> [PR libc/3011].

	inside libc itself.  Use INTDEF and INTDEF2 to define appropriate
Diffstat (limited to 'catgets/open_catalog.c')
-rw-r--r--catgets/open_catalog.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/catgets/open_catalog.c b/catgets/open_catalog.c
index c38719edb9..66f1bf2850 100644
--- a/catgets/open_catalog.c
+++ b/catgets/open_catalog.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996-2000, 2001 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2000, 2001, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper, <drepper@gnu.org>.
 
@@ -237,7 +237,7 @@ __open_catalog (const char *cat_name, const char *nlspath, const char *env_var,
       /* Save read, handle partial reads.  */
       do
 	{
-	  size_t now = __read (fd, (((char *) &catalog->file_ptr)
+	  size_t now = __read (fd, (((char *) catalog->file_ptr)
 				    + (st.st_size - todo)), todo);
 	  if (now == 0 || now == (size_t) -1)
 	    {