close(this->socket_xfrm_events);
this->socket_xfrm->destroy(this->socket_xfrm);
enumerator = this->policies->create_enumerator(this->policies);
- while (enumerator->enumerate(enumerator, (void**)&policy))
+ while (enumerator->enumerate(enumerator, &policy, &policy))
{
free(policy);
}
/**
* Implementation of private_enumerator_t.enumerator.enumerate.
*/
-static bool enumerate(private_enumerator_t *this, void **item)
+static bool enumerate(private_enumerator_t *this, void **key, void **value)
{
while (this->row < this->table->capacity)
{
if (this->current)
{
pair_t *pair;
- if (this->current->enumerate(this->current, (void**)&pair))
+
+ if (this->current->enumerate(this->current, &pair))
{
- *item = pair->value;
+ *key = pair->key;
+ *value = pair->value;
return TRUE;
}
this->current->destroy(this->current);
else
{
linked_list_t *list;
+
if ((list = this->table->table[this->row]) != NULL)
{
this->current = list->create_enumerator(list);
struct hashtable_t {
/**
- * Create an enumerator over the hash table.
+ * Create an enumerator over the hash table key/value pairs.
*
- * @return enumerator over hash table entries
+ * @return enumerator over (void *key, void *value)
*/
enumerator_t *(*create_enumerator) (hashtable_t *this);