diff options
-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 312c49c84..e14cb36b0 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, | |||
193 | op1 = GNUNET_TESTBED_operation_create_ (&op1, | 193 | op1 = GNUNET_TESTBED_operation_create_ (&op1, |
194 | start_cb, | 194 | start_cb, |
195 | release_cb, | 195 | release_cb, |
196 | OP_PEER_CREATE, /* irrelavant here */ | 196 | OP_PEER_CREATE); |
197 | NULL); | 197 | |
198 | GNUNET_assert (NULL != op1); | 198 | GNUNET_assert (NULL != op1); |
199 | op2 = GNUNET_TESTBED_operation_create_ (&op2, | 199 | op2 = GNUNET_TESTBED_operation_create_ (&op2, |
200 | start_cb, | 200 | start_cb, |
201 | release_cb, | 201 | release_cb, |
202 | OP_PEER_CREATE, /* irrelavant here */ | 202 | OP_PEER_CREATE); |
203 | NULL); | ||
204 | GNUNET_TESTBED_operation_queue_insert_ (q1, op1); | 203 | GNUNET_TESTBED_operation_queue_insert_ (q1, op1); |
205 | GNUNET_TESTBED_operation_queue_insert_ (q2, op1); | 204 | GNUNET_TESTBED_operation_queue_insert_ (q2, op1); |
206 | GNUNET_TESTBED_operation_queue_insert_ (q1, op2); | 205 | GNUNET_TESTBED_operation_queue_insert_ (q1, op2); |
diff --git a/src/testbed/testbed_api_operations.c b/src/testbed/testbed_api_operations.c index 1692171e3..72cb8465e 100644 --- a/src/testbed/testbed_api_operations.c +++ b/src/testbed/testbed_api_operations.c | |||
@@ -116,11 +116,6 @@ struct GNUNET_TESTBED_Operation | |||
116 | struct OperationQueue **queues; | 116 | struct OperationQueue **queues; |
117 | 117 | ||
118 | /** | 118 | /** |
119 | * Pointer to operation's data | ||
120 | */ | ||
121 | void *data; | ||
122 | |||
123 | /** | ||
124 | * The Operation ID | 119 | * The Operation ID |
125 | */ | 120 | */ |
126 | uint64_t id; | 121 | uint64_t id; |
@@ -199,15 +194,13 @@ check_readiness (struct GNUNET_TESTBED_Operation *op) | |||
199 | * @param start function to call to start the operation | 194 | * @param start function to call to start the operation |
200 | * @param release function to call to close down the operation | 195 | * @param release function to call to close down the operation |
201 | * @param type the type of the operation | 196 | * @param type the type of the operation |
202 | * @param data operation's relavant data | ||
203 | * @return handle to the operation | 197 | * @return handle to the operation |
204 | */ | 198 | */ |
205 | struct GNUNET_TESTBED_Operation * | 199 | struct GNUNET_TESTBED_Operation * |
206 | GNUNET_TESTBED_operation_create_ (void *cls, | 200 | GNUNET_TESTBED_operation_create_ (void *cls, |
207 | OperationStart start, | 201 | OperationStart start, |
208 | OperationRelease release, | 202 | OperationRelease release, |
209 | enum OperationType type, | 203 | enum OperationType type) |
210 | void *data) | ||
211 | { | 204 | { |
212 | struct GNUNET_TESTBED_Operation *op; | 205 | struct GNUNET_TESTBED_Operation *op; |
213 | 206 | ||
@@ -216,7 +209,6 @@ GNUNET_TESTBED_operation_create_ (void *cls, | |||
216 | op->release = release; | 209 | op->release = release; |
217 | op->cb_cls = cls; | 210 | op->cb_cls = cls; |
218 | op->type = type; | 211 | op->type = type; |
219 | op->data = data; | ||
220 | return op; | 212 | return op; |
221 | } | 213 | } |
222 | 214 | ||
diff --git a/src/testbed/testbed_api_operations.h b/src/testbed/testbed_api_operations.h index a02f397ac..92f5644c9 100644 --- a/src/testbed/testbed_api_operations.h +++ b/src/testbed/testbed_api_operations.h | |||
@@ -168,8 +168,7 @@ struct GNUNET_TESTBED_Operation * | |||
168 | GNUNET_TESTBED_operation_create_ (void *cls, | 168 | GNUNET_TESTBED_operation_create_ (void *cls, |
169 | OperationStart start, | 169 | OperationStart start, |
170 | OperationRelease release, | 170 | OperationRelease release, |
171 | enum OperationType type, | 171 | enum OperationType type); |
172 | void *data); | ||
173 | 172 | ||
174 | 173 | ||
175 | /** | 174 | /** |