aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2017-03-07 23:44:57 +0100
committerChristian Grothoff <christian@grothoff.org>2017-03-07 23:44:57 +0100
commit0e592870059883b779d02a14fa5ea13be5f50595 (patch)
tree3b4168dba92f70cdd22183f340e3b3e093f89a36
parentf64bd0cae02eb4a1e8e3dfdd911260f7185ffd37 (diff)
parent542de3e5df8dbe2bfc3d4290e75f5684e0deaf59 (diff)
downloadgnunet-0e592870059883b779d02a14fa5ea13be5f50595.tar.gz
gnunet-0e592870059883b779d02a14fa5ea13be5f50595.zip
Merge branch 'master' of git+ssh://gnunet.org/gnunet
-rw-r--r--src/consensus/Makefile.am5
-rw-r--r--src/fs/fs_unindex.c3
-rw-r--r--src/secretsharing/Makefile.am6
3 files changed, 8 insertions, 6 deletions
diff --git a/src/consensus/Makefile.am b/src/consensus/Makefile.am
index 2b1987fbc..c0205ee5d 100644
--- a/src/consensus/Makefile.am
+++ b/src/consensus/Makefile.am
@@ -18,8 +18,6 @@ if USE_COVERAGE
18 AM_CFLAGS = -fprofile-arcs -ftest-coverage 18 AM_CFLAGS = -fprofile-arcs -ftest-coverage
19endif 19endif
20 20
21bin_PROGRAMS = \
22 gnunet-consensus-profiler
23 21
24libexec_PROGRAMS = \ 22libexec_PROGRAMS = \
25 gnunet-service-consensus 23 gnunet-service-consensus
@@ -86,6 +84,9 @@ libgnunet_plugin_block_consensus_la_LDFLAGS = \
86 84
87 85
88if HAVE_TESTING 86if HAVE_TESTING
87bin_PROGRAMS = \
88 gnunet-consensus-profiler
89
89check_PROGRAMS = \ 90check_PROGRAMS = \
90 test_consensus_api 91 test_consensus_api
91 92
diff --git a/src/fs/fs_unindex.c b/src/fs/fs_unindex.c
index a672b84d5..ad1499f00 100644
--- a/src/fs/fs_unindex.c
+++ b/src/fs/fs_unindex.c
@@ -454,7 +454,8 @@ continue_after_remove (void *cls,
454 * Function called from datastore with result from us looking for 454 * Function called from datastore with result from us looking for
455 * a UBlock. There are four cases: 455 * a UBlock. There are four cases:
456 * 1) no result, means we move on to the next keyword 456 * 1) no result, means we move on to the next keyword
457 * 2) UID is the same as the first UID, means we move on to next keyword 457 * 2) data hash is the same as an already seen data hash, means we move on to
458 * next keyword
458 * 3) UBlock for a different CHK, means we keep looking for more 459 * 3) UBlock for a different CHK, means we keep looking for more
459 * 4) UBlock is for our CHK, means we remove the block and then move 460 * 4) UBlock is for our CHK, means we remove the block and then move
460 * on to the next keyword 461 * on to the next keyword
diff --git a/src/secretsharing/Makefile.am b/src/secretsharing/Makefile.am
index 485183e36..4b9a06c40 100644
--- a/src/secretsharing/Makefile.am
+++ b/src/secretsharing/Makefile.am
@@ -17,9 +17,6 @@ if USE_COVERAGE
17endif 17endif
18 18
19 19
20bin_PROGRAMS = \
21 gnunet-secretsharing-profiler
22
23libexec_PROGRAMS = \ 20libexec_PROGRAMS = \
24 gnunet-service-secretsharing 21 gnunet-service-secretsharing
25 22
@@ -57,6 +54,9 @@ libgnunetsecretsharing_la_LDFLAGS = \
57 $(GN_LIB_LDFLAGS) 54 $(GN_LIB_LDFLAGS)
58 55
59if HAVE_TESTING 56if HAVE_TESTING
57bin_PROGRAMS = \
58 gnunet-secretsharing-profiler
59
60check_PROGRAMS = \ 60check_PROGRAMS = \
61 test_secretsharing_api 61 test_secretsharing_api
62 62