make clang static analysis happy

[oweals/gnunet.git] / src / fs / fs_unindex.c

diff --git a/src/fs/fs_unindex.c b/src/fs/fs_unindex.c
index 977344b98d8ab5ceedda9f1053d77ee279b4f8f5..5d1e7c8f09f617ed8a27acb3ab7c98c88970ffd2 100644 (file)
--- a/src/fs/fs_unindex.c
+++ b/src/fs/fs_unindex.c
@@ -20,12 +20,9 @@
 
 /**
  * @file fs/fs_unindex.c
- * @author Krista Bennett
+ * @author Krista Grothoff
  * @author Christian Grothoff
  * @brief Unindex file.
- *
- * TODO:
- * - code cleanup (share more with upload.c)
  */
 #include "platform.h"
 #include "gnunet_constants.h"
@@ -82,8 +79,9 @@ unindex_reader (void *cls,
  * Fill in all of the generic fields for 
  * an unindex event.
  *
- * @param pc structure to fill in
- * @param sc overall unindex context
+ * @param pi structure to fill in
+ * @param uc overall unindex context
+ * @param offset where we are in the file (for progress)
  */
 static void
 make_unindex_status (struct GNUNET_FS_ProgressInfo *pi,
@@ -98,8 +96,8 @@ make_unindex_status (struct GNUNET_FS_ProgressInfo *pi,
     = GNUNET_TIME_calculate_eta (uc->start_time,
                                 offset,
                                 uc->file_size);
-  pi->value.publish.duration = GNUNET_TIME_absolute_get_duration (uc->start_time);
-  pi->value.publish.completed = offset;
+  pi->value.unindex.duration = GNUNET_TIME_absolute_get_duration (uc->start_time);
+  pi->value.unindex.completed = offset;
 }
 
 
@@ -217,7 +215,7 @@ unindex_process (void *cls,
   else /* on-demand encoded DBLOCK */
     {
       size = sizeof(struct OnDemandBlock);
-      odb.offset = offset;
+      odb.offset = GNUNET_htonll (offset);
       odb.file_id = uc->file_id;
       data = &odb;
     }
@@ -286,7 +284,7 @@ process_fs_response (void *cls,
 {
   struct GNUNET_FS_UnindexContext *uc = cls;
 
-  GNUNET_CLIENT_disconnect (uc->client);
+  GNUNET_CLIENT_disconnect (uc->client, GNUNET_NO);
   uc->client = NULL;
   if (uc->state != UNINDEX_STATE_FS_NOTIFY) 
     {
@@ -318,7 +316,8 @@ process_fs_response (void *cls,
       return;
     }
   uc->fh = GNUNET_DISK_file_open (uc->filename,
-                                 GNUNET_DISK_OPEN_READ);
+                                 GNUNET_DISK_OPEN_READ,
+                                 GNUNET_DISK_PERM_NONE);
   if (NULL == uc->fh)
     {
       GNUNET_DATASTORE_disconnect (uc->dsh, GNUNET_NO);
@@ -374,11 +373,13 @@ process_hash (void *cls,
   req.header.type = htons (GNUNET_MESSAGE_TYPE_FS_UNINDEX);
   req.reserved = 0;
   req.file_id = *file_id;
-  GNUNET_CLIENT_transmit_and_get_response (uc->client,
-                                          &req.header,
-                                          GNUNET_CONSTANTS_SERVICE_TIMEOUT,
-                                          &process_fs_response,
-                                          uc);
+  GNUNET_break (GNUNET_OK == 
+               GNUNET_CLIENT_transmit_and_get_response (uc->client,
+                                                        &req.header,
+                                                        GNUNET_CONSTANTS_SERVICE_TIMEOUT,
+                                                        GNUNET_YES,
+                                                        &process_fs_response,
+                                                        uc));
 }
 
 
@@ -387,11 +388,13 @@ process_hash (void *cls,
  *
  * @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 (struct GNUNET_FS_Handle *h,
-                  const char *filename)
+GNUNET_FS_unindex_start (struct GNUNET_FS_Handle *h,
+                        const char *filename,
+                        void *cctx)
 {
   struct GNUNET_FS_UnindexContext *ret;
   struct GNUNET_FS_ProgressInfo pi;
@@ -407,6 +410,7 @@ GNUNET_FS_unindex (struct GNUNET_FS_Handle *h,
   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;
@@ -417,7 +421,6 @@ GNUNET_FS_unindex (struct GNUNET_FS_Handle *h,
               &pi);
   GNUNET_CRYPTO_hash_file (h->sched,
                           GNUNET_SCHEDULER_PRIORITY_IDLE,
-                          GNUNET_NO,
                           filename,
                           HASHING_BLOCKSIZE,
                           &process_hash,