gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r2249 - in GNUnet/src/applications/fs: ecrs fsui


From: grothoff
Subject: [GNUnet-SVN] r2249 - in GNUnet/src/applications/fs: ecrs fsui
Date: Mon, 14 Nov 2005 01:56:58 -0800 (PST)

Author: grothoff
Date: 2005-11-14 01:56:54 -0800 (Mon, 14 Nov 2005)
New Revision: 2249

Modified:
   GNUnet/src/applications/fs/ecrs/download.c
   GNUnet/src/applications/fs/ecrs/unindex.c
   GNUnet/src/applications/fs/fsui/unindex.c
Log:
fixing mantis 957

Modified: GNUnet/src/applications/fs/ecrs/download.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/download.c  2005-11-13 21:32:44 UTC (rev 
2248)
+++ GNUnet/src/applications/fs/ecrs/download.c  2005-11-14 09:56:54 UTC (rev 
2249)
@@ -1119,7 +1119,7 @@
   }
 
   minSleep = 5000 * cronMILLIS; /* max-sleep! */
-  perm = permute(STRONG, rm->requestListIndex);
+  perm = permute(WEAK, rm->requestListIndex);
   for (i=0;i<rm->requestListIndex;i++) {
     int j = perm[i];
     if (rm->requestList[j]->lastTimeout + TTL_DECREMENT < now) {

Modified: GNUnet/src/applications/fs/ecrs/unindex.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/unindex.c   2005-11-13 21:32:44 UTC (rev 
2248)
+++ GNUnet/src/applications/fs/ecrs/unindex.c   2005-11-14 09:56:54 UTC (rev 
2249)
@@ -301,23 +301,27 @@
       goto FAILURE;
     }
     if (! wasIndexed) {
-      fileBlockEncode(db,
-                     size,
-                     &chk.query,
-                     &value);
-      *value = *dblock; /* copy options! */
+      if (OK == 
+         fileBlockEncode(db,
+                         size,
+                         &chk.query,
+                         &value)) {
+       *value = *dblock; /* copy options! */
 #if STRICT_CHECKS
-      if (OK != FS_delete(sock,
-                         value)) {
+       if (OK != FS_delete(sock,
+                           value)) {
+         FREE(value);
+         BREAK();
+         goto FAILURE;
+       }
+#else
+       FS_delete(sock,
+                 value);
+#endif
        FREE(value);
-       BREAK();
+      } else {
        goto FAILURE;
       }
-#else
-      FS_delete(sock,
-               value);
-#endif
-      FREE(value);
     }
     pos += size;
     cronTime(&now);

Modified: GNUnet/src/applications/fs/fsui/unindex.c
===================================================================
--- GNUnet/src/applications/fs/fsui/unindex.c   2005-11-13 21:32:44 UTC (rev 
2248)
+++ GNUnet/src/applications/fs/fsui/unindex.c   2005-11-14 09:56:54 UTC (rev 
2249)
@@ -82,7 +82,7 @@
     event.data.UnindexComplete.start_time = utc->start_time;
   } else {
     event.type = FSUI_unindex_error;
-    event.data.message = _("Unindex failed.\n");
+    event.data.message = _("Unindex failed.");
   }
   utc->ctx->ecb(utc->ctx->ecbClosure,
                &event);
@@ -123,7 +123,7 @@
   if (0 != PTHREAD_CREATE(&tl->handle,
                          (PThreadMain) &unindexThread,
                          utc,
-                         16 * 1024)) {
+                         32 * 1024)) {
     LOG_STRERROR(LOG_ERROR, "PTHREAD_CREATE");
     FREE(tl);
     FREE(utc->filename);





reply via email to

[Prev in Thread] Current Thread [Next in Thread]