diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-03-31 13:21:24 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-03-31 13:21:24 +0000 |
commit | 672d4cc8c0d9d2f7420e837511bffac88777345b (patch) | |
tree | fd087cd175dceb4d41b71334cf6d9f0fcadb24c2 /src/fs/gnunet-service-fs_pe.c | |
parent | 664f658ddc0b302cc7b04d31319dba1e26f5f603 (diff) | |
download | gnunet-672d4cc8c0d9d2f7420e837511bffac88777345b.tar.gz gnunet-672d4cc8c0d9d2f7420e837511bffac88777345b.zip |
fixes
Diffstat (limited to 'src/fs/gnunet-service-fs_pe.c')
-rw-r--r-- | src/fs/gnunet-service-fs_pe.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/fs/gnunet-service-fs_pe.c b/src/fs/gnunet-service-fs_pe.c index c193c1472..e09a8567b 100644 --- a/src/fs/gnunet-service-fs_pe.c +++ b/src/fs/gnunet-service-fs_pe.c | |||
@@ -217,7 +217,6 @@ schedule_peer_transmission (void *cls, | |||
217 | { | 217 | { |
218 | struct PeerPlan *pp = cls; | 218 | struct PeerPlan *pp = cls; |
219 | struct GSF_RequestPlan *rp; | 219 | struct GSF_RequestPlan *rp; |
220 | struct GSF_PendingRequestData *prd; | ||
221 | size_t msize; | 220 | size_t msize; |
222 | 221 | ||
223 | pp->task = GNUNET_SCHEDULER_NO_TASK; | 222 | pp->task = GNUNET_SCHEDULER_NO_TASK; |
@@ -226,12 +225,10 @@ schedule_peer_transmission (void *cls, | |||
226 | while ( (NULL != (rp = GNUNET_CONTAINER_heap_peek (pp->delay_heap))) && | 225 | while ( (NULL != (rp = GNUNET_CONTAINER_heap_peek (pp->delay_heap))) && |
227 | (GNUNET_TIME_absolute_get_remaining (rp->earliest_transmission).rel_value == 0) ) | 226 | (GNUNET_TIME_absolute_get_remaining (rp->earliest_transmission).rel_value == 0) ) |
228 | { | 227 | { |
229 | rp = GNUNET_CONTAINER_heap_remove_root (pp->delay_heap); | 228 | GNUNET_assert (rp == GNUNET_CONTAINER_heap_remove_root (pp->delay_heap)); |
230 | rp->hn = GNUNET_CONTAINER_heap_insert (pp->priority_heap, | 229 | rp->hn = GNUNET_CONTAINER_heap_insert (pp->priority_heap, |
231 | rp, | 230 | rp, |
232 | rp->priority); | 231 | rp->priority); |
233 | if (NULL == (rp = GNUNET_CONTAINER_heap_peek (pp->delay_heap))) | ||
234 | break; | ||
235 | } | 232 | } |
236 | if (0 == GNUNET_CONTAINER_heap_get_size (pp->priority_heap)) | 233 | if (0 == GNUNET_CONTAINER_heap_get_size (pp->priority_heap)) |
237 | { | 234 | { |
@@ -247,7 +244,6 @@ schedule_peer_transmission (void *cls, | |||
247 | /* process from priority heap */ | 244 | /* process from priority heap */ |
248 | rp = GNUNET_CONTAINER_heap_peek (pp->priority_heap); | 245 | rp = GNUNET_CONTAINER_heap_peek (pp->priority_heap); |
249 | GNUNET_assert (NULL != rp); | 246 | GNUNET_assert (NULL != rp); |
250 | prd = GSF_pending_request_get_data_ (rp->pr); | ||
251 | msize = GSF_pending_request_get_message_ (rp->pr, 0, NULL); | 247 | msize = GSF_pending_request_get_message_ (rp->pr, 0, NULL); |
252 | pp->pth = GSF_peer_transmit_ (pp->cp, | 248 | pp->pth = GSF_peer_transmit_ (pp->cp, |
253 | GNUNET_YES, | 249 | GNUNET_YES, |