Changeset 4eb4c0f for protocols/jabber/jabber_util.c

Timestamp:

2008-02-16T17:15:31Z (17 years ago)

Author:

Sven Moritz Hallberg <sm@…>

Branches:

master

Children:

fd9fa52

Parents:

8961950 (diff), ca60550 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge in upstream changes

File:

• protocols/jabber/jabber_util.c (modified) (2 diffs)

protocols/jabber/jabber_util.c

@@ -142 +142 @@
         entry->node = node;
         entry->func = func;
+        entry->saved_at = time( NULL );
         g_hash_table_insert( jd->node_cache, xt_find_attr( node, "id" ), entry );
 }
@@ -163 +164 @@
 {
         struct jabber_data *jd = ic->proto_data;
-        
-        g_hash_table_foreach_remove( jd->node_cache, jabber_cache_clean_entry, NULL );
-}
-
-gboolean jabber_cache_clean_entry( gpointer key, gpointer entry_, gpointer nullpointer )
+        time_t threshold = time( NULL ) - JABBER_CACHE_MAX_AGE;
+        
+        g_hash_table_foreach_remove( jd->node_cache, jabber_cache_clean_entry, &threshold );
+}
+
+gboolean jabber_cache_clean_entry( gpointer key, gpointer entry_, gpointer threshold_ )
 {
         struct jabber_cache_entry *entry = entry_;
-        struct xt_node *node = entry->node;
-        
-        if( node->flags & XT_SEEN )
-                return TRUE;
-        else
-        {
-                node->flags |= XT_SEEN;
-                return FALSE;
-        }
+        time_t *threshold = threshold_;
+        
+        return entry->saved_at < *threshold;
 }