[GNUnet-SVN] r5255 - in GNUnet: . src/applications/datastore src/applications/fs/module

[gnunet]

Author: grothoff
Date: 2007-07-06 23:03:27 -0600 (Fri, 06 Jul 2007)
New Revision: 5255

Modified:
   GNUnet/ChangeLog
   GNUnet/src/applications/datastore/prefetch.c
   GNUnet/src/applications/fs/module/dht_push.c
Log:
cleanup

Modified: GNUnet/ChangeLog
===================================================================
--- GNUnet/ChangeLog    2007-07-07 04:55:32 UTC (rev 5254)
+++ GNUnet/ChangeLog    2007-07-07 05:03:27 UTC (rev 5255)
@@ -1,7 +1,7 @@
 Fri Jul  6 22:54:52 MDT 2007
        Fixed bugs in F2F topology code.  Eliminated a few
-       confusing LOG messages.
-
+       confusing LOG messages. 
+       
 Sun Jul  1 20:35:00 MDT 2007
        Fixed issue with too many TCP connections being
        created.  Reduced CPU overheads by increasing

Modified: GNUnet/src/applications/datastore/prefetch.c
===================================================================
--- GNUnet/src/applications/datastore/prefetch.c        2007-07-07 04:55:32 UTC 
(rev 5254)
+++ GNUnet/src/applications/datastore/prefetch.c        2007-07-07 05:03:27 UTC 
(rev 5255)
@@ -91,11 +91,11 @@
   int load;
   while (doneSignal == NO) {
     sq->iterateMigrationOrder(&acquire,
-                     NULL);
+                             NULL);
     /* sleep here - otherwise we may start looping immediately
        if there is no content in the DB! */
     load = os_cpu_get_load(ectx,
-                  cfg);
+                          cfg);
     if (load < 10)
       load = 10;    /* never sleep less than 500 ms */
     if (load > 100)

Modified: GNUnet/src/applications/fs/module/dht_push.c
===================================================================
--- GNUnet/src/applications/fs/module/dht_push.c        2007-07-07 04:55:32 UTC 
(rev 5254)
+++ GNUnet/src/applications/fs/module/dht_push.c        2007-07-07 05:03:27 UTC 
(rev 5255)
@@ -91,26 +91,28 @@
   if (dht == NULL)
     return SYSERR;
   dht->put(key,
-     ntohl(value->type),
-     ntohl(value->size) - sizeof(Datastore_Value),
-     ntohll(value->expirationTime),
-     (const char*) &value[1]);
+          ntohl(value->type),
+          ntohl(value->size) - sizeof(Datastore_Value),
+          ntohll(value->expirationTime),
+          (const char*) &value[1]);
   if (stats != NULL)
     stats->change(stat_push_count, 1);
+  if (dht == NULL)
+    return SYSERR;
   return OK;
 }
 
 static void * push_thread(void * cls) {
   while ( (dht != NULL) &&
-    (sqstore != NULL) ) {
+         (sqstore != NULL) ) {
     if (total == 0)
       total = 1;
     total = sqstore->iterateNonAnonymous(0,
-                                YES,
-                                &push_callback,
-                                NULL);
+                                        YES,
+                                        &push_callback,
+                                        NULL);
     if ( (dht != NULL) &&
-   (total == 0) )
+        (total == 0) )
       PTHREAD_SLEEP(15 * cronMINUTES);
   }
   return NULL;