Revert change to increment header_size; we do that in write_string.

2008-08-21  Colin Walters  <walters@verbum.org>

	* girepository/girmodule.c (g_ir_module_build_typelib):
	Revert change to increment header_size; we do that in
	write_string.

svn path=/trunk/; revision=440

diff --git a/ChangeLog b/ChangeLog
index 2ffb657..b183137 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2008-08-21  Colin Walters  <walters@verbum.org>
 
+       * girepository/girmodule.c (g_ir_module_build_typelib): 
+       Revert change to increment header_size; we do that in
+       write_string.
+
+2008-08-21  Colin Walters  <walters@verbum.org>
+
        * girepository/girnode.c (write_string): Tweak to
        use UINT instead of INT.  Not likely to matter.
        * girepository/girmodule.c (g_ir_module_build_typelib):

diff --git a/girepository/girmodule.c b/girepository/girmodule.c
index 1fcdadb..1077a48 100644 (file)
--- a/girepository/girmodule.c
+++ b/girepository/girmodule.c
@@ -104,12 +104,8 @@ g_ir_module_build_typelib (GIrModule  *module,
 
   /* Adjust size for strings allocated in header below specially */
   size += strlen (module->name);
-  header_size = ALIGN_VALUE (header_size + strlen (module->name) + 1, 4);
   if (module->shared_library) 
-    {
-      size += strlen (module->shared_library);
-      header_size = ALIGN_VALUE (header_size + strlen (module->shared_library) + 1, 4);
-    }
+    size += strlen (module->shared_library);
 
   g_message ("allocating %d bytes (%d header, %d directory, %d entries)\n", 
          size, header_size, dir_size, size - header_size - dir_size);