[GNUnet-SVN] r8182 - in GNUnet/src/applications: fs/fsui sqstore_mysql

[gnunet]

Author: grothoff
Date: 2009-02-02 23:12:36 -0700 (Mon, 02 Feb 2009)
New Revision: 8182

Modified:
   GNUnet/src/applications/fs/fsui/recursive_download_test.c
   GNUnet/src/applications/sqstore_mysql/mysql.c
Log:
fix

Modified: GNUnet/src/applications/fs/fsui/recursive_download_test.c
===================================================================
--- GNUnet/src/applications/fs/fsui/recursive_download_test.c   2009-02-03 
05:53:06 UTC (rev 8181)
+++ GNUnet/src/applications/fs/fsui/recursive_download_test.c   2009-02-03 
06:12:36 UTC (rev 8182)
@@ -278,6 +278,8 @@
       GNUNET_GC_free (cfg);
       return -1;
     }
+  fprintf(stderr,
+         "Setup...\n");
 #if START_DAEMON
   GNUNET_disk_directory_remove (NULL,
                                 "/tmp/gnunet-fsui-recursive_download_test/");
@@ -298,6 +300,8 @@
   kuri =
     GNUNET_ECRS_keyword_command_line_to_uri (ectx, 2,
                                              (const char **) keywords);
+  fprintf(stderr,
+         "Uploading...\n");
   waitForEvent = GNUNET_FSUI_upload_completed;
   upload = GNUNET_FSUI_upload_start (ctx,
                                      fn,
@@ -322,6 +326,8 @@
   upload = NULL;
   CHECK (upURI != NULL);
 
+  fprintf(stderr,
+         "Downloading...\n");
   waitForEvent = GNUNET_FSUI_download_completed;
   fn43 = makeName (43);
   download = GNUNET_FSUI_download_start (ctx,
@@ -341,6 +347,8 @@
         break;
     }
 FAILURE:
+  fprintf(stderr,
+         "Cleanup...\n");
   if (meta != NULL)
     GNUNET_meta_data_destroy (meta);
   if (ctx != NULL)

Modified: GNUnet/src/applications/sqstore_mysql/mysql.c
===================================================================
--- GNUnet/src/applications/sqstore_mysql/mysql.c       2009-02-03 05:53:06 UTC 
(rev 8181)
+++ GNUnet/src/applications/sqstore_mysql/mysql.c       2009-02-03 06:12:36 UTC 
(rev 8182)
@@ -448,13 +448,16 @@
   GNUNET_GE_BREAK (NULL, ret <= 1);     /* should only have one result! */
   if (ret > 0)
     ret = GNUNET_OK;
-  if ((ret != GNUNET_OK) ||
-      (rbind[0].buffer_length != contentSize) || (length != contentSize))
+  if ( (ret != GNUNET_OK) ||
+       (rbind[0].buffer_length != contentSize) || 
+       (length != contentSize))
     {
-      GNUNET_GE_BREAK (NULL, (ret != GNUNET_OK));
-      GNUNET_GE_BREAK (NULL, (rbind[0].buffer_length != contentSize));
-      GNUNET_GE_BREAK (NULL, (length != contentSize));
-      do_delete_entry_by_vkey (vkey);
+      GNUNET_GE_BREAK (NULL, ret != 0);     /* should have one result! */
+      GNUNET_GE_BREAK (NULL, length == contentSize);     /* length should 
match! */
+      GNUNET_GE_BREAK (NULL, rbind[0].buffer_length == contentSize);     /* 
length should be internally consistent! */
+      do_delete_value (vkey);
+      if (ret != 0)
+       do_delete_entry_by_vkey (vkey);
       content_size -= ntohl (datum->size);
       GNUNET_free (datum);
       return NULL;