diff options
author | Christian Grothoff <christian@grothoff.org> | 2020-07-05 16:32:34 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2020-07-05 16:32:34 +0200 |
commit | e31c1d4a9f78c4e31fda1f98fe349b33abdd01a2 (patch) | |
tree | 61df772a93f7f21af7c715ddd4b9a3f1a50e0509 /src/testbed/testbed_api_operations.c | |
parent | 1437556645417e6302862845e7ebcbd4c9908357 (diff) | |
download | gnunet-e31c1d4a9f78c4e31fda1f98fe349b33abdd01a2.tar.gz gnunet-e31c1d4a9f78c4e31fda1f98fe349b33abdd01a2.zip |
GNUNET_free_non_null -> GNUNET_free
Diffstat (limited to 'src/testbed/testbed_api_operations.c')
-rw-r--r-- | src/testbed/testbed_api_operations.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/testbed/testbed_api_operations.c b/src/testbed/testbed_api_operations.c index a406c0e0b..ae85e0842 100644 --- a/src/testbed/testbed_api_operations.c +++ b/src/testbed/testbed_api_operations.c | |||
@@ -696,7 +696,7 @@ decide_capacity (struct OperationQueue *opq, | |||
696 | } | 696 | } |
697 | 697 | ||
698 | ret: | 698 | ret: |
699 | GNUNET_free_non_null (evict_entries); | 699 | GNUNET_free (evict_entries); |
700 | if (NULL != ops_) | 700 | if (NULL != ops_) |
701 | *ops_ = ops; | 701 | *ops_ = ops; |
702 | else | 702 | else |
@@ -771,7 +771,7 @@ check_readiness (struct GNUNET_TESTBED_Operation *op) | |||
771 | if (GNUNET_NO == decide_capacity (op->queues[i], op->qentries[i], | 771 | if (GNUNET_NO == decide_capacity (op->queues[i], op->qentries[i], |
772 | &ops, &n_ops)) | 772 | &ops, &n_ops)) |
773 | { | 773 | { |
774 | GNUNET_free_non_null (evict_ops); | 774 | GNUNET_free (evict_ops); |
775 | return GNUNET_NO; | 775 | return GNUNET_NO; |
776 | } | 776 | } |
777 | if (NULL == ops) | 777 | if (NULL == ops) |
@@ -842,7 +842,7 @@ cleanup_tslots (struct OperationQueue *queue) | |||
842 | continue; | 842 | continue; |
843 | GNUNET_CONTAINER_DLL_remove (op->tslots_head, op->tslots_tail, tslot); | 843 | GNUNET_CONTAINER_DLL_remove (op->tslots_head, op->tslots_tail, tslot); |
844 | } | 844 | } |
845 | GNUNET_free_non_null (fctx->tslots_freeptr); | 845 | GNUNET_free (fctx->tslots_freeptr); |
846 | fctx->tslots_freeptr = NULL; | 846 | fctx->tslots_freeptr = NULL; |
847 | fctx->alloc_head = NULL; | 847 | fctx->alloc_head = NULL; |
848 | fctx->alloc_tail = NULL; | 848 | fctx->alloc_tail = NULL; |
@@ -1337,7 +1337,7 @@ GNUNET_TESTBED_operation_release_ (struct GNUNET_TESTBED_Operation *op) | |||
1337 | } | 1337 | } |
1338 | GNUNET_free (entry); | 1338 | GNUNET_free (entry); |
1339 | } | 1339 | } |
1340 | GNUNET_free_non_null (op->qentries); | 1340 | GNUNET_free (op->qentries); |
1341 | GNUNET_free (op->queues); | 1341 | GNUNET_free (op->queues); |
1342 | GNUNET_free (op->nres); | 1342 | GNUNET_free (op->nres); |
1343 | if (NULL != op->release) | 1343 | if (NULL != op->release) |
@@ -1376,7 +1376,7 @@ GNUNET_TESTBED_operations_fini () | |||
1376 | warn = 1; | 1376 | warn = 1; |
1377 | queue_destroy (queue); | 1377 | queue_destroy (queue); |
1378 | } | 1378 | } |
1379 | GNUNET_free_non_null (expired_opqs); | 1379 | GNUNET_free (expired_opqs); |
1380 | n_expired_opqs = 0; | 1380 | n_expired_opqs = 0; |
1381 | if (warn) | 1381 | if (warn) |
1382 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 1382 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, |