From 65f138e9a6156983ac74f8f1a5b8051d8f9be86a Mon Sep 17 00:00:00 2001
From: Daniel Golle <daniel@makrotopia.org>
Date: Sun, 5 Mar 2017 16:19:37 +0100
Subject: build profilers only if testing is enabled

build fails of consensus and secretsharing fails otherwise
make[7]: *** No rule to make target '../../src/testbed/libgnunettestbed.la', needed by 'gnunet-consensus-profiler'.  Stop
---
 src/consensus/Makefile.am     | 5 +++--
 src/secretsharing/Makefile.am | 6 +++---
 2 files changed, 6 insertions(+), 5 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
   AM_CFLAGS = -fprofile-arcs -ftest-coverage
 endif
 
-bin_PROGRAMS = \
- gnunet-consensus-profiler
 
 libexec_PROGRAMS = \
  gnunet-service-consensus
@@ -86,6 +84,9 @@ libgnunet_plugin_block_consensus_la_LDFLAGS = \
 
 
 if HAVE_TESTING
+bin_PROGRAMS = \
+ gnunet-consensus-profiler
+
 check_PROGRAMS = \
  test_consensus_api
 
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
 endif
 
 
-bin_PROGRAMS = \
- gnunet-secretsharing-profiler
-
 libexec_PROGRAMS = \
  gnunet-service-secretsharing
 
@@ -57,6 +54,9 @@ libgnunetsecretsharing_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)
 
 if HAVE_TESTING
+bin_PROGRAMS = \
+ gnunet-secretsharing-profiler
+
 check_PROGRAMS = \
  test_secretsharing_api
 
-- 
cgit v1.2.3


From 542de3e5df8dbe2bfc3d4290e75f5684e0deaf59 Mon Sep 17 00:00:00 2001
From: David Barksdale <amatus@amat.us>
Date: Mon, 6 Mar 2017 21:28:43 -0600
Subject: Update comment to match code

---
 src/fs/fs_unindex.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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,
  * Function called from datastore with result from us looking for
  * a UBlock.  There are four cases:
  * 1) no result, means we move on to the next keyword
- * 2) UID is the same as the first UID, means we move on to next keyword
+ * 2) data hash is the same as an already seen data hash, means we move on to
+ *    next keyword
  * 3) UBlock for a different CHK, means we keep looking for more
  * 4) UBlock is for our CHK, means we remove the block and then move
  *           on to the next keyword
-- 
cgit v1.2.3