[GNUnet-SVN] r9288 - in gnunet/src: fs include

[gnunet]

Author: grothoff
Date: 2009-10-25 13:33:17 -0600 (Sun, 25 Oct 2009)
New Revision: 9288

Modified:
   gnunet/src/fs/fs_unindex.c
   gnunet/src/fs/gnunet-unindex.c
   gnunet/src/fs/test_fs_unindex.c
   gnunet/src/include/gnunet_fs_service.h
Log:
API fix

Modified: gnunet/src/fs/fs_unindex.c
===================================================================
--- gnunet/src/fs/fs_unindex.c  2009-10-25 19:28:48 UTC (rev 9287)
+++ gnunet/src/fs/fs_unindex.c  2009-10-25 19:33:17 UTC (rev 9288)
@@ -390,11 +390,13 @@
  *
  * @param h handle to the file sharing subsystem
  * @param filename file to unindex
+ * @param cctx initial value for the client context
  * @return NULL on error, otherwise handle 
  */
 struct GNUNET_FS_UnindexContext *
 GNUNET_FS_unindex_start (struct GNUNET_FS_Handle *h,
-                        const char *filename)
+                        const char *filename,
+                        void *cctx)
 {
   struct GNUNET_FS_UnindexContext *ret;
   struct GNUNET_FS_ProgressInfo pi;
@@ -410,6 +412,7 @@
   ret->filename = GNUNET_strdup (filename);
   ret->start_time = GNUNET_TIME_absolute_get ();
   ret->file_size = size;
+  ret->client_info = cctx;
 
   // FIXME: make persistent!
   pi.status = GNUNET_FS_STATUS_UNINDEX_START;

Modified: gnunet/src/fs/gnunet-unindex.c
===================================================================
--- gnunet/src/fs/gnunet-unindex.c      2009-10-25 19:28:48 UTC (rev 9287)
+++ gnunet/src/fs/gnunet-unindex.c      2009-10-25 19:33:17 UTC (rev 9288)
@@ -139,7 +139,8 @@
       return;
     }
   uc = GNUNET_FS_unindex_start (ctx,
-                               args[0]);
+                               args[0],
+                               NULL);
   if (NULL == uc)
     {
       fprintf (stderr,

Modified: gnunet/src/fs/test_fs_unindex.c
===================================================================
--- gnunet/src/fs/test_fs_unindex.c     2009-10-25 19:28:48 UTC (rev 9287)
+++ gnunet/src/fs/test_fs_unindex.c     2009-10-25 19:33:17 UTC (rev 9288)
@@ -114,7 +114,8 @@
              (unsigned long long) (FILESIZE * 1000 / 
(1+GNUNET_TIME_absolute_get_duration (start).value) / 1024));
       start = GNUNET_TIME_absolute_get ();
       unindex = GNUNET_FS_unindex_start (fs,
-                                        fn);
+                                        fn,
+                                        "unindex");
       GNUNET_assert (unindex != NULL);
       break;
     case GNUNET_FS_STATUS_UNINDEX_COMPLETED:

Modified: gnunet/src/include/gnunet_fs_service.h
===================================================================
--- gnunet/src/include/gnunet_fs_service.h      2009-10-25 19:28:48 UTC (rev 
9287)
+++ gnunet/src/include/gnunet_fs_service.h      2009-10-25 19:33:17 UTC (rev 
9288)
@@ -2012,12 +2012,13 @@
  *
  * @param h handle to the file sharing subsystem
  * @param filename file to unindex
+ * @param cctx initial value for the client context
  * @return NULL on error, otherwise handle 
  */
-// FIXME: add a "void *" context for the client to arguments!?
 struct GNUNET_FS_UnindexContext *
 GNUNET_FS_unindex_start (struct GNUNET_FS_Handle *h,
-                        const char *filename);
+                        const char *filename,
+                        void *cctx);
 
 
 /**