** Fix for bug #494299

2007-11-13  Ondrej Jirman  <megous@megous.com>

	** Fix for bug #494299

	* libedataserver/e-file-cache.c: (add_key_to_slist),
	(add_object_to_slist): Rename helper functions.
	* libedataserver/e-file-cache.c: (e_file_cache_get_keys):
	Fix memory corruption.

svn path=/trunk/; revision=8203

diff --git a/ChangeLog b/ChangeLog
index dce7c55..d3ad86d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-11-13  Ondrej Jirman  <megous@megous.com>
+
+       ** Fix for bug #494299
+
+       * libedataserver/e-file-cache.c: (add_key_to_slist),
+       (add_object_to_slist): Rename helper functions.
+       * libedataserver/e-file-cache.c: (e_file_cache_get_keys):
+       Fix memory corruption.
+
 2007-10-29  Srinivasa Ragavan  <sragavan@novell.com>
 
        * NEWS, configure.in: Evolution Data Server 2.21.1 release.

diff --git a/libedataserver/e-file-cache.c b/libedataserver/e-file-cache.c
index 2299431..7883d4f 100644 (file)
--- a/libedataserver/e-file-cache.c
+++ b/libedataserver/e-file-cache.c
@@ -243,11 +243,11 @@ e_file_cache_remove (EFileCache *cache)
 }
 
 static void
-add_key_to_list (const char *key, const char *value, gpointer user_data)
+add_key_to_slist (const char *key, const char *value, gpointer user_data)
 {
-       GList **keys = user_data;
+       GSList **keys = user_data;
 
-       *keys = g_list_append (*keys, (char *) key);
+       *keys = g_slist_append (*keys, (char *) key);
 }
 
 /**
@@ -262,16 +262,16 @@ gboolean
 e_file_cache_clean (EFileCache *cache)
 {
        EFileCachePrivate *priv;
-       GList *keys = NULL;
+       GSList *keys = NULL;
 
        g_return_val_if_fail (E_IS_FILE_CACHE (cache), FALSE);
 
        priv = cache->priv;
 
-       e_xmlhash_foreach_key (priv->xml_hash, (EXmlHashFunc) add_key_to_list, &keys);
+       e_xmlhash_foreach_key (priv->xml_hash, (EXmlHashFunc) add_key_to_slist, &keys);
        while (keys != NULL) {
                e_file_cache_remove_object (cache, (const char *) keys->data);
-               keys = g_list_remove (keys, keys->data);
+               keys = g_slist_remove (keys, keys->data);
        }
 
        return TRUE;
@@ -321,7 +321,7 @@ e_file_cache_get_object (EFileCache *cache, const char *key)
 }
 
 static void
-add_object_to_list (const char *key, const char *value, gpointer user_data)
+add_object_to_slist (const char *key, const char *value, gpointer user_data)
 {
        GSList **list = user_data;
 
@@ -341,7 +341,7 @@ e_file_cache_get_objects (EFileCache *cache)
 
        priv = cache->priv;
 
-       e_xmlhash_foreach_key (priv->xml_hash, (EXmlHashFunc) add_object_to_list, &list);
+       e_xmlhash_foreach_key (priv->xml_hash, (EXmlHashFunc) add_object_to_slist, &list);
 
        return list;
 }
@@ -359,7 +359,7 @@ e_file_cache_get_keys (EFileCache *cache)
 
        priv = cache->priv;
 
-       e_xmlhash_foreach_key (priv->xml_hash, (EXmlHashFunc) add_key_to_list, &list);
+       e_xmlhash_foreach_key (priv->xml_hash, (EXmlHashFunc) add_key_to_slist, &list);
 
        return list;
 }