diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-11-28 19:30:15 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-11-28 19:30:15 +0000 |
commit | 5c485543eae231ed44e84611aa029e548e54acba (patch) | |
tree | 88cd3108f86f4c087810dec0d3ffe2b8a259bbd0 /src/fs/gnunet-service-fs_pe.c | |
parent | 933cd4f41e1043438900618960555a1589de95dc (diff) | |
download | gnunet-5c485543eae231ed44e84611aa029e548e54acba.tar.gz gnunet-5c485543eae231ed44e84611aa029e548e54acba.zip |
-check return value
Diffstat (limited to 'src/fs/gnunet-service-fs_pe.c')
-rw-r--r-- | src/fs/gnunet-service-fs_pe.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/fs/gnunet-service-fs_pe.c b/src/fs/gnunet-service-fs_pe.c index 607eb6122..a17715dcf 100644 --- a/src/fs/gnunet-service-fs_pe.c +++ b/src/fs/gnunet-service-fs_pe.c | |||
@@ -439,7 +439,7 @@ transmit_message_callback (void *cls, size_t buf_size, void *buf) | |||
439 | /** | 439 | /** |
440 | * Figure out when and how to transmit to the given peer. | 440 | * Figure out when and how to transmit to the given peer. |
441 | * | 441 | * |
442 | * @param cls the 'struct PeerPlan' | 442 | * @param cls the `struct PeerPlan` |
443 | * @param tc scheduler context | 443 | * @param tc scheduler context |
444 | */ | 444 | */ |
445 | static void | 445 | static void |
@@ -506,7 +506,7 @@ schedule_peer_transmission (void *cls, | |||
506 | 506 | ||
507 | 507 | ||
508 | /** | 508 | /** |
509 | * Closure for 'merge_pr'. | 509 | * Closure for merge_pr(). |
510 | */ | 510 | */ |
511 | struct MergeContext | 511 | struct MergeContext |
512 | { | 512 | { |
@@ -573,7 +573,8 @@ merge_pr (void *cls, const struct GNUNET_HashCode * query, void *element) | |||
573 | * @param pr request with the entry | 573 | * @param pr request with the entry |
574 | */ | 574 | */ |
575 | void | 575 | void |
576 | GSF_plan_add_ (struct GSF_ConnectedPeer *cp, struct GSF_PendingRequest *pr) | 576 | GSF_plan_add_ (struct GSF_ConnectedPeer *cp, |
577 | struct GSF_PendingRequest *pr) | ||
577 | { | 578 | { |
578 | const struct GNUNET_PeerIdentity *id; | 579 | const struct GNUNET_PeerIdentity *id; |
579 | struct PeerPlan *pp; | 580 | struct PeerPlan *pp; |
@@ -594,15 +595,16 @@ GSF_plan_add_ (struct GSF_ConnectedPeer *cp, struct GSF_PendingRequest *pr) | |||
594 | pp->delay_heap = | 595 | pp->delay_heap = |
595 | GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MIN); | 596 | GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MIN); |
596 | pp->cp = cp; | 597 | pp->cp = cp; |
597 | GNUNET_CONTAINER_multipeermap_put (plans, | 598 | GNUNET_assert (GNUNET_OK == |
598 | id, pp, | 599 | GNUNET_CONTAINER_multipeermap_put (plans, |
599 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY); | 600 | id, pp, |
601 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY)); | ||
600 | } | 602 | } |
601 | mpc.merged = GNUNET_NO; | 603 | mpc.merged = GNUNET_NO; |
602 | mpc.pr = pr; | 604 | mpc.pr = pr; |
603 | GNUNET_CONTAINER_multihashmap_get_multiple (pp->plan_map, | 605 | GNUNET_CONTAINER_multihashmap_get_multiple (pp->plan_map, |
604 | &GSF_pending_request_get_data_ | 606 | &GSF_pending_request_get_data_ |
605 | (pr)->query, &merge_pr, &mpc); // 8 MB in 'merge_pr' | 607 | (pr)->query, &merge_pr, &mpc); |
606 | if (GNUNET_NO != mpc.merged) | 608 | if (GNUNET_NO != mpc.merged) |
607 | return; | 609 | return; |
608 | GNUNET_CONTAINER_multihashmap_get_multiple (pp->plan_map, | 610 | GNUNET_CONTAINER_multihashmap_get_multiple (pp->plan_map, |
@@ -617,7 +619,7 @@ GSF_plan_add_ (struct GSF_ConnectedPeer *cp, struct GSF_PendingRequest *pr) | |||
617 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 619 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
618 | "Planning transmission of query `%s' to peer `%s'\n", | 620 | "Planning transmission of query `%s' to peer `%s'\n", |
619 | GNUNET_h2s (&prd->query), GNUNET_i2s (id)); | 621 | GNUNET_h2s (&prd->query), GNUNET_i2s (id)); |
620 | rp = GNUNET_new (struct GSF_RequestPlan); // 8 MB | 622 | rp = GNUNET_new (struct GSF_RequestPlan); |
621 | bi = GNUNET_new (struct GSF_PendingRequestPlanBijection); | 623 | bi = GNUNET_new (struct GSF_PendingRequestPlanBijection); |
622 | bi->rp = rp; | 624 | bi->rp = rp; |
623 | bi->pr = pr; | 625 | bi->pr = pr; |
@@ -627,8 +629,8 @@ GSF_plan_add_ (struct GSF_ConnectedPeer *cp, struct GSF_PendingRequest *pr) | |||
627 | GNUNET_assert (GNUNET_YES == | 629 | GNUNET_assert (GNUNET_YES == |
628 | GNUNET_CONTAINER_multihashmap_put (pp->plan_map, | 630 | GNUNET_CONTAINER_multihashmap_put (pp->plan_map, |
629 | get_rp_key (rp), rp, | 631 | get_rp_key (rp), rp, |
630 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE)); // 8 MB | 632 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE)); |
631 | plan (pp, rp); // +5 MB (plan/heap-insert) | 633 | plan (pp, rp); |
632 | } | 634 | } |
633 | 635 | ||
634 | 636 | ||