[GNUnet-SVN] r3519 - GNUnet/src/applications/fs/fsui

[grothoff]

Author: grothoff
Date: 2006-10-20 22:18:25 -0700 (Fri, 20 Oct 2006)
New Revision: 3519

Modified:
   GNUnet/src/applications/fs/fsui/deserialize.c
   GNUnet/src/applications/fs/fsui/search.c
   GNUnet/src/applications/fs/fsui/serialize.c
Log:
fix

Modified: GNUnet/src/applications/fs/fsui/deserialize.c
===================================================================
--- GNUnet/src/applications/fs/fsui/deserialize.c       2006-10-21 03:44:58 UTC 
(rev 3518)
+++ GNUnet/src/applications/fs/fsui/deserialize.c       2006-10-21 05:18:25 UTC 
(rev 3519)
@@ -519,6 +519,8 @@
       GE_BREAK(NULL, 0);
       break;
     }
+    printf("Reading upload %s\n",
+          l.filename);
     list = MALLOC(sizeof(struct FSUI_UploadList));
     list->shared = shared;
     memcpy(list, &l, sizeof(struct FSUI_UploadList));
@@ -556,6 +558,7 @@
       GE_BREAK(NULL, 0);
       break;
     }
+    printf("Reading shared\n");
     memset(&sshared,
           0,
           sizeof(FSUI_UploadShared));   
@@ -567,6 +570,7 @@
     if (big == 2) 
       READSTRING(sshared.extractor_config, 1024*1024);
     shared = MALLOC(sizeof(FSUI_UploadShared));
+    printf("Allocated shared %p\n", shared);
     memcpy(shared,
           &sshared,
           sizeof(FSUI_UploadShared));
@@ -574,6 +578,7 @@
                             &ctx->activeUploads,
                             fd,
                             shared)) {
+      GE_BREAK(NULL, 0);
 #if 0
       /* cannot do this, readUploadList
         may have added *some* uploads that

Modified: GNUnet/src/applications/fs/fsui/search.c
===================================================================
--- GNUnet/src/applications/fs/fsui/search.c    2006-10-21 03:44:58 UTC (rev 
3518)
+++ GNUnet/src/applications/fs/fsui/search.c    2006-10-21 05:18:25 UTC (rev 
3519)
@@ -378,7 +378,7 @@
   GROW(pos->resultsReceived,
        pos->sizeResultsReceived,
        0);
-  for (i=0;i<pos->sizeResultsReceived;i++) {
+  for (i=0;i<pos->sizeUnmatchedResultsReceived;i++) {
     ECRS_freeUri(pos->unmatchedResultsReceived[i].fi.uri);
     ECRS_freeMetaData(pos->unmatchedResultsReceived[i].fi.meta);
     GROW(pos->unmatchedResultsReceived[i].matchingKeys,

Modified: GNUnet/src/applications/fs/fsui/serialize.c
===================================================================
--- GNUnet/src/applications/fs/fsui/serialize.c 2006-10-21 03:44:58 UTC (rev 
3518)
+++ GNUnet/src/applications/fs/fsui/serialize.c 2006-10-21 05:18:25 UTC (rev 
3519)
@@ -231,6 +231,7 @@
 
   while (upos != NULL) {
     if (upos->parent == &ctx->activeUploads) {
+      printf("Writing shared!\n");
       shared = upos->shared;
       WRITEINT(fd, (shared->extractor_config != NULL) ? 2 : 3);
       WRITEINT(fd, shared->doIndex);
@@ -244,6 +245,8 @@
       WRITEINT(fd, 1);
       WRITEINT(fd, (upos->uri != NULL) ? 1 : 2);
     }
+    printf("Writing upload %s!\n",
+          upos->filename);
     WRITEINT(fd, upos->state);
     WRITELONG(fd, upos->completed);
     WRITELONG(fd, upos->total);