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

[gnunet]

Author: grothoff
Date: 2008-02-24 21:42:06 -0700 (Sun, 24 Feb 2008)
New Revision: 6447

Modified:
   GNUnet/src/applications/fs/fsui/deserialize.c
   GNUnet/src/applications/fs/fsui/search.c
   GNUnet/src/applications/fs/fsui/searchtest.c
Log:
clean

Modified: GNUnet/src/applications/fs/fsui/deserialize.c
===================================================================
--- GNUnet/src/applications/fs/fsui/deserialize.c       2008-02-25 04:40:42 UTC 
(rev 6446)
+++ GNUnet/src/applications/fs/fsui/deserialize.c       2008-02-25 04:42:06 UTC 
(rev 6447)
@@ -687,7 +687,7 @@
       READLONG (sshared.expiration);
       if ((big & 2) == 2)
         READSTRING (sshared.extractor_config, 1024 * 1024);
-      READSTRING(sshared.top_filename, 1024 * 1024);
+      READSTRING (sshared.top_filename, 1024 * 1024);
       if ((big & 4) == 4)
         {
           sshared.global_keywords = read_uri (ctx->ectx, fd);

Modified: GNUnet/src/applications/fs/fsui/search.c
===================================================================
--- GNUnet/src/applications/fs/fsui/search.c    2008-02-25 04:40:42 UTC (rev 
6446)
+++ GNUnet/src/applications/fs/fsui/search.c    2008-02-25 04:42:06 UTC (rev 
6447)
@@ -377,7 +377,7 @@
 GNUNET_FSUI_search_pause (struct GNUNET_FSUI_Context *ctx,
                           struct GNUNET_FSUI_SearchList *sl)
 {
-  void * unused; 
+  void *unused;
 
   GNUNET_mutex_lock (ctx->lock);
   if (sl->state != GNUNET_FSUI_ACTIVE)

Modified: GNUnet/src/applications/fs/fsui/searchtest.c
===================================================================
--- GNUnet/src/applications/fs/fsui/searchtest.c        2008-02-25 04:40:42 UTC 
(rev 6446)
+++ GNUnet/src/applications/fs/fsui/searchtest.c        2008-02-25 04:42:06 UTC 
(rev 6447)
@@ -141,6 +141,7 @@
       return -1;
     }
 #if START_DAEMON
+  GNUNET_disk_directory_remove (NULL, "/tmp/gnunet-check-fsui/");
   daemon = GNUNET_daemon_start (NULL, cfg, "peer.conf", GNUNET_NO);
   GNUNET_GE_ASSERT (NULL, daemon > 0);
   CHECK (GNUNET_OK ==
@@ -166,13 +167,13 @@
   ctx = GNUNET_FSUI_start (NULL,
                            cfg, "fsuisearchtest", 32, GNUNET_YES,
                            &eventCallback, NULL);
-  GNUNET_FSUI_search_pause(ctx, search);
+  GNUNET_FSUI_search_pause (ctx, search);
   GNUNET_FSUI_stop (ctx);
   /* resume search! */
   ctx = GNUNET_FSUI_start (NULL,
                            cfg, "fsuisearchtest", 32, GNUNET_YES,
                            &eventCallback, NULL);
-  GNUNET_FSUI_search_restart(ctx, search);
+  GNUNET_FSUI_search_restart (ctx, search);
 
   fn = makeName (42);
   GNUNET_disk_file_write (NULL,
@@ -210,10 +211,9 @@
         break;
     }
   GNUNET_FSUI_upload_stop (ctx, upload);
-  GNUNET_FSUI_search_pause(ctx, search);
-  GNUNET_FSUI_search_restart(ctx, search);
-  while ( (uri == NULL) &&
-         (GNUNET_shutdown_test() != GNUNET_YES) )
+  GNUNET_FSUI_search_pause (ctx, search);
+  GNUNET_FSUI_search_restart (ctx, search);
+  while ((uri == NULL) && (GNUNET_shutdown_test () != GNUNET_YES))
     {
       prog++;
       CHECK (prog < 10000);