gnunet-svn
[Top][All Lists]
Advanced

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

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


From: gnunet
Subject: [GNUnet-SVN] r6754 - GNUnet/src/applications/fs/fsui
Date: Thu, 24 Apr 2008 23:23:42 -0600 (MDT)

Author: grothoff
Date: 2008-04-24 23:23:42 -0600 (Thu, 24 Apr 2008)
New Revision: 6754

Modified:
   GNUnet/src/applications/fs/fsui/downloadtest.c
   GNUnet/src/applications/fs/fsui/fsuitest.c
   GNUnet/src/applications/fs/fsui/recursivetest.c
   GNUnet/src/applications/fs/fsui/searchtest.c
   GNUnet/src/applications/fs/fsui/serializetest.c
   GNUnet/src/applications/fs/fsui/serializetest2.c
   GNUnet/src/applications/fs/fsui/serializetest3.c
   GNUnet/src/applications/fs/fsui/serializetest4.c
Log:
comperrs

Modified: GNUnet/src/applications/fs/fsui/downloadtest.c
===================================================================
--- GNUnet/src/applications/fs/fsui/downloadtest.c      2008-04-24 16:51:32 UTC 
(rev 6753)
+++ GNUnet/src/applications/fs/fsui/downloadtest.c      2008-04-25 05:23:42 UTC 
(rev 6754)
@@ -134,8 +134,8 @@
 #if DEBUG_VERBOSE
       printf ("Download complete.\n");
 #endif
-      GNUNET_FSUI_search_abort (ctx, search);
-      GNUNET_FSUI_search_stop (ctx, search);
+      GNUNET_FSUI_search_abort (search);
+      GNUNET_FSUI_search_stop (search);
       search = NULL;
       break;
     case GNUNET_FSUI_download_progress:
@@ -273,7 +273,7 @@
       if (GNUNET_shutdown_test () == GNUNET_YES)
         break;
     }
-  GNUNET_FSUI_upload_stop (ctx, upload);
+  GNUNET_FSUI_upload_stop (upload);
   GNUNET_snprintf (keyword, 40, "+%s +%s", keywords[0], keywords[1]);
   uri = GNUNET_ECRS_keyword_string_to_uri (ectx, keyword);
   waitForEvent = GNUNET_FSUI_download_completed;
@@ -330,11 +330,11 @@
   if (ctx != NULL)
     {
       if (unindex != NULL)
-        GNUNET_FSUI_unindex_stop (ctx, unindex);
+        GNUNET_FSUI_unindex_stop (unindex);
       if (download != NULL)
-        GNUNET_FSUI_download_stop (ctx, download);
+        GNUNET_FSUI_download_stop (download);
       if (search != NULL)
-        GNUNET_FSUI_search_stop (ctx, search);
+        GNUNET_FSUI_search_stop (search);
       GNUNET_FSUI_stop (ctx);
     }
   if (fn != NULL)

Modified: GNUnet/src/applications/fs/fsui/fsuitest.c
===================================================================
--- GNUnet/src/applications/fs/fsui/fsuitest.c  2008-04-24 16:51:32 UTC (rev 
6753)
+++ GNUnet/src/applications/fs/fsui/fsuitest.c  2008-04-25 05:23:42 UTC (rev 
6754)
@@ -186,8 +186,8 @@
       if (GNUNET_shutdown_test () == GNUNET_YES)
         break;
     }
-  GNUNET_FSUI_search_abort (ctx, search);
-  GNUNET_FSUI_search_stop (ctx, search);
+  GNUNET_FSUI_search_abort (search);
+  GNUNET_FSUI_search_stop (search);
   unindex = GNUNET_FSUI_unindex_start (ctx, filename);
   prog = 0;
   while (lastEvent != GNUNET_FSUI_unindex_completed)
@@ -199,8 +199,8 @@
         break;
     }
   if (lastEvent != GNUNET_FSUI_unindex_completed)
-    GNUNET_FSUI_unindex_abort (ctx, unindex);
-  GNUNET_FSUI_unindex_stop (ctx, unindex);
+    GNUNET_FSUI_unindex_abort (unindex);
+  GNUNET_FSUI_unindex_stop (unindex);
 
 
   /* END OF TEST CODE */

Modified: GNUnet/src/applications/fs/fsui/recursivetest.c
===================================================================
--- GNUnet/src/applications/fs/fsui/recursivetest.c     2008-04-24 16:51:32 UTC 
(rev 6753)
+++ GNUnet/src/applications/fs/fsui/recursivetest.c     2008-04-25 05:23:42 UTC 
(rev 6754)
@@ -348,7 +348,7 @@
       if (GNUNET_shutdown_test () == GNUNET_YES)
         break;
     }
-  GNUNET_FSUI_upload_stop (ctx, upload);
+  GNUNET_FSUI_upload_stop (upload);
   GNUNET_snprintf (keyword, 40, "+%s +%s", keywords[0], keywords[1]);
   uri = GNUNET_ECRS_keyword_string_to_uri (ectx, keyword);
   waitForEvent = GNUNET_FSUI_download_completed;
@@ -363,19 +363,19 @@
       if (GNUNET_shutdown_test () == GNUNET_YES)
         break;
     }
-  GNUNET_FSUI_search_abort (ctx, search);
-  GNUNET_FSUI_search_stop (ctx, search);
+  GNUNET_FSUI_search_abort (search);
+  GNUNET_FSUI_search_stop (search);
   search = NULL;
   CHECK (download != NULL);
 FAILURE:
   if (ctx != NULL)
     {
       if (unindex != NULL)
-        GNUNET_FSUI_unindex_stop (ctx, unindex);
+        GNUNET_FSUI_unindex_stop (unindex);
       if (download != NULL)
-        GNUNET_FSUI_download_stop (ctx, download);
+        GNUNET_FSUI_download_stop (download);
       if (search != NULL)
-        GNUNET_FSUI_search_stop (ctx, search);
+        GNUNET_FSUI_search_stop (search);
       GNUNET_FSUI_stop (ctx);
     }
   if (fn != NULL)

Modified: GNUnet/src/applications/fs/fsui/searchtest.c
===================================================================
--- GNUnet/src/applications/fs/fsui/searchtest.c        2008-04-24 16:51:32 UTC 
(rev 6753)
+++ GNUnet/src/applications/fs/fsui/searchtest.c        2008-04-25 05:23:42 UTC 
(rev 6754)
@@ -175,13 +175,13 @@
   ctx = GNUNET_FSUI_start (NULL,
                            cfg, "fsuisearchtest", 32, GNUNET_YES,
                            &eventCallback, NULL);
-  GNUNET_FSUI_search_pause (ctx, search);
+  GNUNET_FSUI_search_pause (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 (search);
 
   fn = makeName (42);
   GNUNET_disk_file_write (NULL,
@@ -220,17 +220,17 @@
       if (GNUNET_shutdown_test () == GNUNET_YES)
         break;
     }
-  GNUNET_FSUI_upload_stop (ctx, upload);
-  GNUNET_FSUI_search_pause (ctx, search);
-  GNUNET_FSUI_search_restart (ctx, search);
+  GNUNET_FSUI_upload_stop (upload);
+  GNUNET_FSUI_search_pause (search);
+  GNUNET_FSUI_search_restart (search);
   while ((uri == NULL) && (GNUNET_shutdown_test () != GNUNET_YES))
     {
       prog++;
       CHECK (prog < 10000);
       GNUNET_thread_sleep (50 * GNUNET_CRON_MILLISECONDS);
     }
-  GNUNET_FSUI_search_abort (ctx, search);
-  GNUNET_FSUI_search_stop (ctx, search);
+  GNUNET_FSUI_search_abort (search);
+  GNUNET_FSUI_search_stop (search);
   CHECK (uri != NULL);
   fn = makeName (43);
   meta = GNUNET_ECRS_meta_data_create ();
@@ -251,7 +251,7 @@
       if (GNUNET_shutdown_test () == GNUNET_YES)
         break;
     }
-  GNUNET_FSUI_download_stop (ctx, download);
+  GNUNET_FSUI_download_stop (download);
   fn = makeName (42);
   waitForEvent = GNUNET_FSUI_unindex_completed;
   unindex = GNUNET_FSUI_unindex_start (ctx, fn);
@@ -267,7 +267,7 @@
       if (GNUNET_shutdown_test () == GNUNET_YES)
         break;
     }
-  GNUNET_FSUI_unindex_stop (ctx, unindex);
+  GNUNET_FSUI_unindex_stop (unindex);
 
   /* END OF TEST CODE */
 FAILURE:

Modified: GNUnet/src/applications/fs/fsui/serializetest.c
===================================================================
--- GNUnet/src/applications/fs/fsui/serializetest.c     2008-04-24 16:51:32 UTC 
(rev 6753)
+++ GNUnet/src/applications/fs/fsui/serializetest.c     2008-04-25 05:23:42 UTC 
(rev 6754)
@@ -233,7 +233,7 @@
       if (GNUNET_shutdown_test () == GNUNET_YES)
         break;
     }
-  GNUNET_FSUI_upload_stop (ctx, upload);
+  GNUNET_FSUI_upload_stop (upload);
   waitForEvent = GNUNET_FSUI_unindex_completed;
   unindex = GNUNET_FSUI_unindex_start (ctx, fn);
   CHECK (unindex != NULL);
@@ -273,7 +273,7 @@
   if (ctx != NULL)
     {
       if (unindex != NULL)
-        GNUNET_FSUI_unindex_stop (ctx, unindex);
+        GNUNET_FSUI_unindex_stop (unindex);
       GNUNET_FSUI_stop (ctx);
     }
   if (fn != NULL)

Modified: GNUnet/src/applications/fs/fsui/serializetest2.c
===================================================================
--- GNUnet/src/applications/fs/fsui/serializetest2.c    2008-04-24 16:51:32 UTC 
(rev 6753)
+++ GNUnet/src/applications/fs/fsui/serializetest2.c    2008-04-25 05:23:42 UTC 
(rev 6754)
@@ -381,7 +381,7 @@
   CHECK (upload != NULL);
   GNUNET_ECRS_uri_destroy (kuri);
   kuri = NULL;
-  GNUNET_FSUI_upload_stop (ctx, upload);
+  GNUNET_FSUI_upload_stop (upload);
   CHECK (upURI != NULL);
   GNUNET_snprintf (keyword, 40, "+%s +%s", keywords[0], keywords[1]);
   uri = GNUNET_ECRS_keyword_string_to_uri (ectx, keyword);
@@ -426,20 +426,20 @@
         {
           no_check = 1;
           GNUNET_thread_sleep (50 * GNUNET_CRON_MILLISECONDS);
-          GNUNET_FSUI_search_abort (ctx, search);
-          GNUNET_FSUI_search_stop (ctx, search);
+          GNUNET_FSUI_search_abort (search);
+          GNUNET_FSUI_search_stop (search);
           search = NULL;
           no_check = 0;
         }
       if (GNUNET_shutdown_test () == GNUNET_YES)
         break;
     }
-  GNUNET_FSUI_download_stop (ctx, download);
+  GNUNET_FSUI_download_stop (download);
   for (j = 4; j < 256; j += 4)
     {
       fn = makeName (j);
       unindex = GNUNET_FSUI_unindex_start (ctx, fn);
-      GNUNET_FSUI_unindex_stop (ctx, unindex);
+      GNUNET_FSUI_unindex_stop (unindex);
       UNLINK (fn);
       GNUNET_free (fn);
     }

Modified: GNUnet/src/applications/fs/fsui/serializetest3.c
===================================================================
--- GNUnet/src/applications/fs/fsui/serializetest3.c    2008-04-24 16:51:32 UTC 
(rev 6753)
+++ GNUnet/src/applications/fs/fsui/serializetest3.c    2008-04-25 05:23:42 UTC 
(rev 6754)
@@ -190,8 +190,8 @@
       if (GNUNET_shutdown_test () == GNUNET_YES)
         break;
     }
-  GNUNET_FSUI_search_abort (ctx, search);
-  GNUNET_FSUI_search_stop (ctx, search);
+  GNUNET_FSUI_search_abort (search);
+  GNUNET_FSUI_search_stop (search);
   search = NULL;
   /* END OF TEST CODE */
 FAILURE:

Modified: GNUnet/src/applications/fs/fsui/serializetest4.c
===================================================================
--- GNUnet/src/applications/fs/fsui/serializetest4.c    2008-04-24 16:51:32 UTC 
(rev 6753)
+++ GNUnet/src/applications/fs/fsui/serializetest4.c    2008-04-25 05:23:42 UTC 
(rev 6754)
@@ -354,7 +354,7 @@
   CHECK (upload != NULL);
   GNUNET_ECRS_uri_destroy (kuri);
   kuri = NULL;
-  GNUNET_FSUI_upload_stop (ctx, upload);
+  GNUNET_FSUI_upload_stop (upload);
   CHECK (upURI != NULL);
   GNUNET_snprintf (keyword, 40, "+%s +%s", keywords[0], keywords[1]);
   uri = GNUNET_ECRS_keyword_string_to_uri (ectx, keyword);
@@ -394,12 +394,12 @@
       if (GNUNET_shutdown_test () == GNUNET_YES)
         break;
     }
-  GNUNET_FSUI_download_stop (ctx, download);
+  GNUNET_FSUI_download_stop (download);
   for (j = 4; j < 16; j += 4)
     {
       fn = makeName (j);
       unindex = GNUNET_FSUI_unindex_start (ctx, fn);
-      GNUNET_FSUI_unindex_stop (ctx, unindex);
+      GNUNET_FSUI_unindex_stop (unindex);
       UNLINK (fn);
       GNUNET_free (fn);
     }





reply via email to

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