}
+/**
+ * Free the resources occupied by a cache entry
+ *
+ * @param entry the cache entry to free
+ */
+static void
+free_entry (struct CacheEntry *entry)
+{
+ GNUNET_CONTAINER_DLL_remove (cache_head, cache_tail, entry);
+ GNUNET_free_non_null (entry->hello);
+ GNUNET_free (entry);
+}
+
+
/**
* Creates a new cache entry and then puts it into the cache's hashtable.
*
add_entry (unsigned int peer_id)
{
struct CacheEntry *entry;
-
+
GNUNET_assert (NULL != cache);
if (cache_size == GNUNET_CONTAINER_multihashmap32_size (cache))
{
GNUNET_CONTAINER_multihashmap32_remove (cache, (uint32_t)
entry->peer_id,
entry));
+ free_entry (entry);
}
- entry = GNUNET_malloc (sizeof (struct CacheEntry));
+ entry = GNUNET_new (struct CacheEntry);
entry->peer_id = peer_id;
GNUNET_assert (GNUNET_OK ==
GNUNET_CONTAINER_multihashmap32_put (cache,
GNUNET_assert (NULL != entry);
GNUNET_assert (GNUNET_YES ==
GNUNET_CONTAINER_multihashmap32_remove (cache, key, value));
- GNUNET_free_non_null (entry->hello);
- GNUNET_free (entry);
+ free_entry (entry);
return GNUNET_YES;
}