aboutsummaryrefslogtreecommitdiff
path: root/src/set/gnunet-service-set_union.c
diff options
context:
space:
mode:
authorSchanzenbach, Martin <mschanzenbach@posteo.de>2017-07-03 10:31:57 +0200
committerSchanzenbach, Martin <mschanzenbach@posteo.de>2017-07-03 10:31:57 +0200
commitf599b93d5b402cfa795aaf7bd7057d76c5e57d67 (patch)
tree0f953e5343e27e91e47f7ccc72756207437d023e /src/set/gnunet-service-set_union.c
parentd80df28d5f4814f93b8aa536a1064c77e3d659cc (diff)
parent6cc0e50715eb97baac69c05141f3f3bb3df4ec75 (diff)
downloadgnunet-f599b93d5b402cfa795aaf7bd7057d76c5e57d67.tar.gz
gnunet-f599b93d5b402cfa795aaf7bd7057d76c5e57d67.zip
Merge remote-tracking branch 'origin/master' into credentials
Diffstat (limited to 'src/set/gnunet-service-set_union.c')
-rw-r--r--src/set/gnunet-service-set_union.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/set/gnunet-service-set_union.c b/src/set/gnunet-service-set_union.c
index 4ca10f0b4..b2983545f 100644
--- a/src/set/gnunet-service-set_union.c
+++ b/src/set/gnunet-service-set_union.c
@@ -1467,8 +1467,6 @@ maybe_finish (struct Operation *op)
1467 num_demanded); 1467 num_demanded);
1468 if (0 == num_demanded) 1468 if (0 == num_demanded)
1469 { 1469 {
1470 struct GNUNET_MQ_Envelope *ev;
1471
1472 op->state->phase = PHASE_DONE; 1470 op->state->phase = PHASE_DONE;
1473 send_client_done (op); 1471 send_client_done (op);
1474 destroy_channel (op); 1472 destroy_channel (op);
@@ -1894,8 +1892,6 @@ handle_union_p2p_full_done (void *cls,
1894 break; 1892 break;
1895 case PHASE_FULL_SENDING: 1893 case PHASE_FULL_SENDING:
1896 { 1894 {
1897 struct GNUNET_MQ_Envelope *ev;
1898
1899 LOG (GNUNET_ERROR_TYPE_DEBUG, 1895 LOG (GNUNET_ERROR_TYPE_DEBUG,
1900 "got FULL DONE, finishing\n"); 1896 "got FULL DONE, finishing\n");
1901 /* We sent the full set, and got the response for that. We're done. */ 1897 /* We sent the full set, and got the response for that. We're done. */