gmime r1307 - in trunk: . util

[fejj svn gnome org]

Author: fejj
Date: Sat May 31 03:02:05 2008
New Revision: 1307
URL: http://svn.gnome.org/viewvc/gmime?rev=1307&view=rev

Log:
2008-05-30  Jeffrey Stedfast  <fejj novell com>

	* util/cache.c: Updated for list.[c,h] changes.

	* util/list.c (list_append): Renamed from list_append_node().
	(list_prepend): Renamed from list_prepend_node().
	(list_unlink): Renamed from list_node_unlink().



Modified:
   trunk/ChangeLog
   trunk/util/cache.c
   trunk/util/list.c
   trunk/util/list.h

Modified: trunk/util/cache.c
==============================================================================
--- trunk/util/cache.c	(original)
+++ trunk/util/cache.c	Sat May 31 03:02:05 2008
@@ -83,7 +83,7 @@
 		prev = node->prev;
 		if (cache->expire (cache, (CacheNode *) node)) {
 			g_hash_table_remove (cache->node_hash, ((CacheNode *) node)->key);
-			list_node_unlink (node);
+			list_unlink (node);
 			cache_node_free ((CacheNode *) node);
 			cache->size--;
 		}
@@ -106,7 +106,7 @@
 	node->cache = cache;
 	
 	g_hash_table_insert (cache->node_hash, node->key, node);
-	list_prepend_node (&cache->list, (ListNode *) node);
+	list_prepend (&cache->list, (ListNode *) node);
 	
 	return node;
 }
@@ -118,8 +118,8 @@
 	
 	node = g_hash_table_lookup (cache->node_hash, key);
 	if (node && use) {
-		list_node_unlink ((ListNode *) node);
-		list_prepend_node (&cache->list, (ListNode *) node);
+		list_unlink ((ListNode *) node);
+		list_prepend (&cache->list, (ListNode *) node);
 	}
 	
 	return node;
@@ -132,7 +132,7 @@
 	
 	cache = node->cache;
 	g_hash_table_remove (cache->node_hash, node->key);
-	list_node_unlink ((ListNode *) node);
+	list_unlink ((ListNode *) node);
 	cache_node_free (node);
 	cache->size--;
 }

Modified: trunk/util/list.c
==============================================================================
--- trunk/util/list.c	(original)
+++ trunk/util/list.c	Sat May 31 03:02:05 2008
@@ -87,7 +87,7 @@
 }
 
 ListNode *
-list_prepend_node (List *list, ListNode *node)
+list_prepend (List *list, ListNode *node)
 {
 	node->next = list->head;
 	node->prev = (ListNode *) &list->head;
@@ -98,7 +98,7 @@
 }
 
 ListNode *
-list_append_node (List *list, ListNode *node)
+list_append (List *list, ListNode *node)
 {
 	node->next = (ListNode *) &list->tail;
 	node->prev = list->tailpred;
@@ -109,7 +109,7 @@
 }
 
 ListNode *
-list_node_unlink (ListNode *node)
+list_unlink (ListNode *node)
 {
 	node->next->prev = node->prev;
         node->prev->next = node->next;

Modified: trunk/util/list.h
==============================================================================
--- trunk/util/list.h	(original)
+++ trunk/util/list.h	Sat May 31 03:02:05 2008
@@ -49,10 +49,10 @@
 G_GNUC_INTERNAL ListNode *list_unlink_head (List *list);
 G_GNUC_INTERNAL ListNode *list_unlink_tail (List *list);
 
-G_GNUC_INTERNAL ListNode *list_prepend_node (List *list, ListNode *node);
-G_GNUC_INTERNAL ListNode *list_append_node  (List *list, ListNode *node);
+G_GNUC_INTERNAL ListNode *list_prepend (List *list, ListNode *node);
+G_GNUC_INTERNAL ListNode *list_append  (List *list, ListNode *node);
 
-G_GNUC_INTERNAL ListNode *list_node_unlink (ListNode *node);
+G_GNUC_INTERNAL ListNode *list_unlink (ListNode *node);
 
 G_END_DECLS