aboutsummaryrefslogtreecommitdiff
path: root/src/fs
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2017-03-17 11:53:24 +0100
committerChristian Grothoff <christian@grothoff.org>2017-03-17 11:53:24 +0100
commitc253a40bae417335fab8446f3c7182c8c5d4833f (patch)
tree0517ab35f90bf290744e5a9ddfeb75ca9547cdbe /src/fs
parent273188e646ed4d91ced1dac443e976336be877b4 (diff)
parent79fb947eb8fba243ea65e19b40b65e04f8806865 (diff)
downloadgnunet-c253a40bae417335fab8446f3c7182c8c5d4833f.tar.gz
gnunet-c253a40bae417335fab8446f3c7182c8c5d4833f.zip
Merge branch 'master' into getopt
Diffstat (limited to 'src/fs')
-rw-r--r--src/fs/fs_dirmetascan.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/fs/fs_dirmetascan.c b/src/fs/fs_dirmetascan.c
index 2f79c7c05..7b9f178fd 100644
--- a/src/fs/fs_dirmetascan.c
+++ b/src/fs/fs_dirmetascan.c
@@ -245,12 +245,10 @@ finish_scan (void *cls)
245 * Calls the scanner progress handler. 245 * Calls the scanner progress handler.
246 * 246 *
247 * @param cls the closure (directory scanner object) 247 * @param cls the closure (directory scanner object)
248 * @param client always NULL
249 * @param msg message from the helper process 248 * @param msg message from the helper process
250 */ 249 */
251static int 250static int
252process_helper_msgs (void *cls, 251process_helper_msgs (void *cls,
253 void *client,
254 const struct GNUNET_MessageHeader *msg) 252 const struct GNUNET_MessageHeader *msg)
255{ 253{
256 struct GNUNET_FS_DirScanner *ds = cls; 254 struct GNUNET_FS_DirScanner *ds = cls;