[GNUnet-SVN] r15034 - gnunet/src/fs

[gnunet]

Author: grothoff
Date: 2011-04-19 21:50:20 +0200 (Tue, 19 Apr 2011)
New Revision: 15034

Modified:
   gnunet/src/fs/gnunet-service-fs_push.c
Log:
fix

Modified: gnunet/src/fs/gnunet-service-fs_push.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs_push.c      2011-04-19 19:22:08 UTC (rev 
15033)
+++ gnunet/src/fs/gnunet-service-fs_push.c      2011-04-19 19:50:20 UTC (rev 
15034)
@@ -485,7 +485,7 @@
  */
 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 @@
   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 @@
                                            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 @@
        }
       pos = pos->next;
     }
-  GNUNET_DATASTORE_iterate_get_next (GSF_dsh);
+  consider_gathering ();
 }