make ks_pool_free appear take double pointer

This commit is contained in:
Anthony Minessale authored and Mike Jerris committed 2017-01-25 14:59:36 -06:00
1 parent 73e4c22255
commit d2f04e2133
20 files changed
+83 -74

No files matched your search

+3 -3
View File
@@ -286,7 +286,7 @@ KS_DECLARE(void) ks_dht_destroy(ks_dht_t **dht)
* Cleanup the array of endpoint pointers if it is allocated.
*/
if (d->endpoints) {
ks_pool_free(d->pool, d->endpoints);
ks_pool_free(d->pool, &d->endpoints);
d->endpoints = NULL;
}
@@ -294,7 +294,7 @@ KS_DECLARE(void) ks_dht_destroy(ks_dht_t **dht)
* Cleanup the array of endpoint polling data if it is allocated.
*/
if (d->endpoints_poll) {
ks_pool_free(d->pool, d->endpoints_poll);
ks_pool_free(d->pool, &d->endpoints_poll);
d->endpoints_poll = NULL;
}
@@ -338,7 +338,7 @@ KS_DECLARE(void) ks_dht_destroy(ks_dht_t **dht)
/**
* Free the dht instance from the pool, after this the dht instance memory is invalid.
*/
ks_pool_free(d->pool, d);
ks_pool_free(d->pool, &d);
/**
* At this point dht instance is invalidated so NULL the pointer.
+6 -6
View File
@@ -214,7 +214,7 @@ KS_DECLARE(void) ks_dhtrt_deinitroute(ks_dhtrt_routetable_t **table)
ks_pool_t *pool = (*table)->pool;
ks_pool_free(pool, *table);
ks_pool_free(pool, &(*table));
return;
}
@@ -259,7 +259,7 @@ KS_DECLARE(ks_status_t) ks_dhtrt_create_node( ks_dhtrt_routetable_t *table,
if (( ks_addr_set(&tnode->addr, ip, port, tnode->family) != KS_STATUS_SUCCESS) ||
( ks_rwl_create(&tnode->reflock, table->pool) != KS_STATUS_SUCCESS)) {
ks_pool_free(table->pool, tnode);
ks_pool_free(table->pool, &tnode);
ks_rwl_read_unlock(internal->lock);
return KS_STATUS_FAIL;
}
@@ -308,7 +308,7 @@ KS_DECLARE(ks_status_t) ks_dhtrt_delete_node(ks_dhtrt_routetable_t *table, ks_dh
if (ks_rwl_try_write_lock(node->reflock) == KS_STATUS_SUCCESS) { /* grab exclusive lock on node */
ks_rwl_destroy(&(node->reflock));
ks_pool_free(table->pool, node);
ks_pool_free(table->pool, &node);
}
else {
ks_dhtrt_queue_node_fordelete(table, node);
@@ -718,7 +718,7 @@ uint8_t ks_dhtrt_findclosest_locked_nodes(ks_dhtrt_routetable_t *table, ks_dhtrt
while (tofree) {
ks_dhtrt_sortedxors_t *x = tofree->next;
ks_pool_free(table->pool, tofree);
ks_pool_free(table->pool, &tofree);
tofree = x;
}
@@ -859,10 +859,10 @@ void ks_dhtrt_process_deleted(ks_dhtrt_routetable_t *table)
if (ks_rwl_try_write_lock(node->reflock) == KS_STATUS_SUCCESS) {
ks_rwl_destroy(&(node->reflock));
ks_pool_free(table->pool, node);
ks_pool_free(table->pool, &node);
temp = deleted;
deleted = deleted->next;
ks_pool_free(table->pool, temp);
ks_pool_free(table->pool, &temp);
--internal->deleted_count;
if (prev != NULL) {
prev->next = deleted;
+1 -1
View File
@@ -46,7 +46,7 @@ KS_DECLARE(void) ks_dht_datagram_destroy(ks_dht_datagram_t **datagram)
dg = *datagram;
ks_pool_free(dg->pool, dg);
ks_pool_free(dg->pool, &dg);
*datagram = NULL;
}
+1 -1
View File
@@ -49,7 +49,7 @@ KS_DECLARE(void) ks_dht_endpoint_destroy(ks_dht_endpoint_t **endpoint)
ep = *endpoint;
if (ep->sock != KS_SOCK_INVALID) ks_socket_close(&ep->sock);
ks_pool_free(ep->pool, ep);
ks_pool_free(ep->pool, &ep);
*endpoint = NULL;
}
+1 -1
View File
@@ -45,7 +45,7 @@ KS_DECLARE(void) ks_dht_message_destroy(ks_dht_message_t **message)
ben_free(m->data);
m->data = NULL;
}
ks_pool_free(m->pool, *message);
ks_pool_free(m->pool, &(*message));
*message = NULL;
}
+3 -3
View File
@@ -53,12 +53,12 @@ KS_DECLARE(void) ks_dht_search_destroy(ks_dht_search_t **search)
ks_hash_destroy(&s->pending);
}
if (s->callbacks) {
ks_pool_free(s->pool, s->callbacks);
ks_pool_free(s->pool, &s->callbacks);
s->callbacks = NULL;
}
if (s->mutex) ks_mutex_destroy(&s->mutex);
ks_pool_free(s->pool, s);
ks_pool_free(s->pool, &s);
*search = NULL;
}
@@ -115,7 +115,7 @@ KS_DECLARE(void) ks_dht_search_pending_destroy(ks_dht_search_pending_t **pending
p = *pending;
ks_pool_free(p->pool, p);
ks_pool_free(p->pool, &p);
*pending = NULL;
}
+1 -1
View File
@@ -105,7 +105,7 @@ KS_DECLARE(void) ks_dht_storageitem_destroy(ks_dht_storageitem_t **item)
ben_free(si->v);
si->v = NULL;
}
ks_pool_free(si->pool, si);
ks_pool_free(si->pool, &si);
*item = NULL;
}
+1 -1
View File
@@ -40,7 +40,7 @@ KS_DECLARE(void) ks_dht_transaction_destroy(ks_dht_transaction_t **transaction)
t = *transaction;
ks_pool_free(t->pool, t);
ks_pool_free(t->pool, &t);
*transaction = NULL;
}