summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2011-04-19 19:50:20 +0000
committerChristian Grothoff <christian@grothoff.org>2011-04-19 19:50:20 +0000
commit3121108ec2fd4f5c7a481955c8a02dc8ad65b40e (patch)
tree383fdfce9f25244ef317e39eacc0f6130af4055d /src
parent2380121d84cb842094bef87c6d7c17668238d671 (diff)
fix
Diffstat (limited to 'src')
-rw-r--r--src/fs/gnunet-service-fs_push.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/src/fs/gnunet-service-fs_push.c b/src/fs/gnunet-service-fs_push.c
index c08b57020..90e888b6a 100644
--- a/src/fs/gnunet-service-fs_push.c
+++ b/src/fs/gnunet-service-fs_push.c
@@ -485,7 +485,7 @@ consider_gathering ()
*/
static void
process_migration_content (void *cls,
- const GNUNET_HashCode * key,
+ const GNUNET_HashCode *key,
size_t size,
const void *data,
enum GNUNET_BLOCK_Type type,
@@ -497,17 +497,17 @@ process_migration_content (void *cls,
struct MigrationReadyBlock *mb;
struct MigrationReadyPeer *pos;
+ mig_qe = NULL;
if (key == NULL)
{
- mig_qe = NULL;
consider_gathering ();
return;
}
if (GNUNET_TIME_absolute_get_remaining (expiration).rel_value <
MIN_MIGRATION_CONTENT_LIFETIME.rel_value)
{
- /* content will expire soon, don't bother */
- GNUNET_DATASTORE_iterate_get_next (GSF_dsh);
+ /* content will expire soon, don't bother */
+ consider_gathering ();
return;
}
if (type == GNUNET_BLOCK_TYPE_FS_ONDEMAND)
@@ -517,10 +517,8 @@ process_migration_content (void *cls,
type, priority, anonymity,
expiration, uid,
&process_migration_content,
- NULL))
- {
- GNUNET_DATASTORE_iterate_get_next (GSF_dsh);
- }
+ NULL))
+ consider_gathering ();
return;
}
#if DEBUG_FS
@@ -556,7 +554,7 @@ process_migration_content (void *cls,
}
pos = pos->next;
}
- GNUNET_DATASTORE_iterate_get_next (GSF_dsh);
+ consider_gathering ();
}