diff options
Diffstat (limited to 'src/testbed')
| -rw-r--r-- | src/testbed/test_testbed_api_operations.c | 7 | ||||
| -rw-r--r-- | src/testbed/testbed_api_operations.c | 10 | ||||
| -rw-r--r-- | src/testbed/testbed_api_operations.h | 3 |
3 files changed, 5 insertions, 15 deletions
diff --git a/src/testbed/test_testbed_api_operations.c b/src/testbed/test_testbed_api_operations.c index 312c49c840..e14cb36b0d 100644 --- a/src/testbed/test_testbed_api_operations.c +++ b/src/testbed/test_testbed_api_operations.c @@ -193,14 +193,13 @@ run (void *cls, char *const *args, const char *cfgfile, op1 = GNUNET_TESTBED_operation_create_ (&op1, start_cb, release_cb, - OP_PEER_CREATE, /* irrelavant here */ - NULL); + OP_PEER_CREATE); + GNUNET_assert (NULL != op1); op2 = GNUNET_TESTBED_operation_create_ (&op2, start_cb, release_cb, - OP_PEER_CREATE, /* irrelavant here */ - NULL); + OP_PEER_CREATE); GNUNET_TESTBED_operation_queue_insert_ (q1, op1); GNUNET_TESTBED_operation_queue_insert_ (q2, op1); GNUNET_TESTBED_operation_queue_insert_ (q1, op2); diff --git a/src/testbed/testbed_api_operations.c b/src/testbed/testbed_api_operations.c index 1692171e3d..72cb8465eb 100644 --- a/src/testbed/testbed_api_operations.c +++ b/src/testbed/testbed_api_operations.c @@ -116,11 +116,6 @@ struct GNUNET_TESTBED_Operation struct OperationQueue **queues; /** - * Pointer to operation's data - */ - void *data; - - /** * The Operation ID */ uint64_t id; @@ -199,15 +194,13 @@ check_readiness (struct GNUNET_TESTBED_Operation *op) * @param start function to call to start the operation * @param release function to call to close down the operation * @param type the type of the operation - * @param data operation's relavant data * @return handle to the operation */ struct GNUNET_TESTBED_Operation * GNUNET_TESTBED_operation_create_ (void *cls, OperationStart start, OperationRelease release, - enum OperationType type, - void *data) + enum OperationType type) { struct GNUNET_TESTBED_Operation *op; @@ -216,7 +209,6 @@ GNUNET_TESTBED_operation_create_ (void *cls, op->release = release; op->cb_cls = cls; op->type = type; - op->data = data; return op; } diff --git a/src/testbed/testbed_api_operations.h b/src/testbed/testbed_api_operations.h index a02f397acc..92f5644c90 100644 --- a/src/testbed/testbed_api_operations.h +++ b/src/testbed/testbed_api_operations.h @@ -168,8 +168,7 @@ struct GNUNET_TESTBED_Operation * GNUNET_TESTBED_operation_create_ (void *cls, OperationStart start, OperationRelease release, - enum OperationType type, - void *data); + enum OperationType type); /** |