Attachment 2356 Details for Bug 2940 – the patch

[patch] the patch

sharedmime.diff (text/plain), 1.89 KB, created by Matthias Clasen on 2005-04-08 14:14:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthias Clasen

Created: 2005-04-08 14:14:12 UTC

Size: 1.89 KB

patch

obsolete

>Index: update-mime-database.c
>===================================================================
>RCS file: /cvs/mime/shared-mime-info/update-mime-database.c,v
>retrieving revision 1.34
>diff -u -p -r1.34 update-mime-database.c
>--- update-mime-database.c	1 Apr 2005 19:35:06 -0000	1.34
>+++ update-mime-database.c	8 Apr 2005 21:09:33 -0000
>@@ -1538,11 +1538,10 @@ static gboolean
> write_card16 (FILE *cache, guint16 n)
> {
>   int i;
>-  gchar s[2];
> 
>-  *((guint16 *)s) = GUINT16_TO_BE (n);
>+  n = GUINT16_TO_BE (n);
>   
>-  i = fwrite (s, 2, 1, cache);
>+  i = fwrite ((char *)&n, 2, 1, cache);
> 
>   return i == 1;
> }
>@@ -1551,11 +1550,10 @@ static gboolean
> write_card32 (FILE *cache, guint32 n)
> {
>   int i;
>-  gchar s[4];
> 
>-  *((guint32 *)s) = GUINT32_TO_BE (n);
>+  n = GUINT32_TO_BE (n);
>   
>-  i = fwrite (s, 4, 1, cache);
>+  i = fwrite ((char *)&n, 4, 1, cache);
> 
>   return i == 1;
> }
>@@ -1673,7 +1671,7 @@ write_map (FILE         *cache,
>   map_data.pool = strings;
>   map_data.get_value = get_value;
>   map_data.data = map;
>-  map_data.offset = *offset;
>+  map_data.offset = *offset + 4;
>   map_data.error = FALSE;
> 
>   g_ptr_array_foreach (keys, write_map_entry, &map_data);
>@@ -2462,6 +2461,7 @@ write_strings (FILE       *cache, 
> static gboolean 
> write_cache (FILE *cache)
> {
>+  guint strings_offset;
>   guint alias_offset;
>   guint parent_offset;
>   guint literal_offset;
>@@ -2481,12 +2481,15 @@ write_cache (FILE *cache)
> 
>   strings = g_hash_table_new (g_str_hash, g_str_equal);
>   collect_strings (strings);
>+  strings_offset = offset;
>+
>   if (!write_strings (cache, strings, &offset))
>     {
>       g_printerr ("Failed to write strings\n");
>       return FALSE;
>     }
>-  g_print ("Wrote %d strings\n", g_hash_table_size (strings));
>+  g_print ("Wrote %d strings at %x - %x\n", 
>+	   g_hash_table_size (strings), strings_offset, offset);
> 
>   alias_offset = offset;
>   if (!write_alias_cache (cache, strings, &offset))

Actions: View | Splinter Review

Attachments on bug 2940: 2356

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.