[BZ #776]

	* iconv/iconvconfig.c: Fix comment for the output file.
	(write_output): Clear padding in header.

2 files changed, 14 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 52d7bcda96..448d370a9d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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
diff --git a/iconv/iconvconfig.c b/iconv/iconvconfig.c
index 18ff3a53b1..51ceecb070 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
 
@@ -1179,6 +1179,9 @@ write_output (void)
 	}
     }
 
+  /* Clear padding.  */
+  memset (&header, 0, sizeof (struct gconvcache_header));
+
   header.magic = GCONVCACHE_MAGIC;
 
   iov[0].iov_base = &header;