summary refs log tree commit diff
path: root/iconv/iconvconfig.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2005-03-03 08:28:23 +0000
committerUlrich Drepper <drepper@redhat.com>2005-03-03 08:28:23 +0000
commit2e2b6e2618b515340650b2f60d84112840df7570 (patch)
tree8fb6568328038e782fa6bd05423f9b8a36a2338c /iconv/iconvconfig.c
parentfab0abb44691c24b2253c3f65897b1947da7fba4 (diff)
downloadglibc-2e2b6e2618b515340650b2f60d84112840df7570.tar.gz
glibc-2e2b6e2618b515340650b2f60d84112840df7570.tar.xz
glibc-2e2b6e2618b515340650b2f60d84112840df7570.zip
2005-03-01  H.J. Lu  <hongjiu.lu@intel.com>
	[BZ #776]
	* iconv/iconvconfig.c: Fix comment for the output file.
	(write_output): Clear padding in header.

2005-03-03  Ulrich Drepper  <drepper@redhat.com>

	* elf/dl-close.c (_dl_close): Don't try to set up new searchpath if the
	loader is closed.  Fixes unload3.
	* elf/tst-global1.c: New file.
	* elf/Makefile (tests): Add tst-global1.

2005-03-03  Jakub Jelinek  <jakub@redhat.com>

	* elf/Makefile: Add rules to build and run unload3 test.
	* elf/unload3.c: New test.
	* elf/unload3mod1.c: New file.
	* elf/unload3mod2.c: New file.
	* elf/unload3mod3.c: New file.
	* elf/unload3mod4.c: New file.
Diffstat (limited to 'iconv/iconvconfig.c')
-rw-r--r--iconv/iconvconfig.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/iconv/iconvconfig.c b/iconv/iconvconfig.c
index 4698fe755f..aa337cbedf 100644
--- a/iconv/iconvconfig.c
+++ b/iconv/iconvconfig.c
@@ -985,11 +985,11 @@ next_prime (uint32_t seed)
 
    Offset   Length       Description
    0000     4            Magic header bytes
-   0004     4            Offset of string table (stoff)
-   0008     4            Offset of name hashing table (hoff)
-   000C     4            Hashing table size (hsize)
-   0010     4            Offset of module table (moff)
-   0014     4            Offset of other conversion module table (ooff)
+   0004     2            Offset of string table (stoff)
+   0006     2            Offset of name hashing table (hoff)
+   0008     2            Hashing table size (hsize)
+   000A     2            Offset of module table (moff)
+   000C     2            Offset of other conversion module table (ooff)
 
    stoff    ???          String table
 
@@ -1178,6 +1178,9 @@ write_output (void)
 	}
     }
 
+  /* Clear padding.  */
+  memset (&header, 0, sizeof (struct gconvcache_header));
+
   header.magic = GCONVCACHE_MAGIC;
 
   iov[0].iov_base = &header;