types

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

diff --git a/src/fs/fs_unindex.c b/src/fs/fs_unindex.c
index 2d16e9aeea725f388f7e2576db6a484e754077ce..977344b98d8ab5ceedda9f1053d77ee279b4f8f5 100644 (file)
--- a/src/fs/fs_unindex.c
+++ b/src/fs/fs_unindex.c
@@ -78,74 +78,6 @@ unindex_reader (void *cls,
 }
 
 
-/**
- * Continuation called to notify client about result of the
- * datastore removal operation.
- *
- * @param cls closure
- * @param success GNUNET_SYSERR on failure
- * @param msg NULL on success, otherwise an error message
- */
-static void
-process_cont (void *cls,
-             int success,
-             const char *msg)
-{
-  struct GNUNET_FS_UnindexContext *uc = cls;
-  // FIXME: may want to check for errors
-  // OTHER than content-not-present!
-  GNUNET_FS_tree_encoder_next (uc->tc);
-}
-
-
-/**
- * Function called asking for the current (encoded)
- * block to be processed.  After processing the
- * client should either call "GNUNET_FS_tree_encode_next"
- * or (on error) "GNUNET_FS_tree_encode_finish".
- *
- * @param cls closure
- * @param query the query for the block (key for lookup in the datastore)
- * @param offset offset of the block
- * @param type type of the block (IBLOCK or DBLOCK)
- * @param block the (encrypted) block
- * @param block_size size of block (in bytes)
- */
-static void 
-unindex_process (void *cls,
-                const GNUNET_HashCode *query,
-                uint64_t offset,
-                unsigned int type,
-                const void *block,
-                uint16_t block_size)
-{
-  struct GNUNET_FS_UnindexContext *uc = cls;
-  uint32_t size;
-  const void *data;
-  struct OnDemandBlock odb;
-
-  if (type != GNUNET_DATASTORE_BLOCKTYPE_DBLOCK)
-    {
-      size = block_size;
-      data = block;
-    }
-  else /* on-demand encoded DBLOCK */
-    {
-      size = sizeof(struct OnDemandBlock);
-      odb.offset = offset;
-      odb.file_id = uc->file_id;
-      data = &odb;
-    }
-  GNUNET_DATASTORE_remove (uc->dsh,
-                          query,
-                          block_size,
-                          block,
-                          &process_cont,
-                          uc,
-                          GNUNET_CONSTANTS_SERVICE_TIMEOUT);
-}
-
-
 /**
  * Fill in all of the generic fields for 
  * an unindex event.
@@ -226,6 +158,79 @@ signal_unindex_error (struct GNUNET_FS_UnindexContext *uc,
 }
 
 
+/**
+ * Continuation called to notify client about result of the
+ * datastore removal operation.
+ *
+ * @param cls closure
+ * @param success GNUNET_SYSERR on failure
+ * @param msg NULL on success, otherwise an error message
+ */
+static void
+process_cont (void *cls,
+             int success,
+             const char *msg)
+{
+  struct GNUNET_FS_UnindexContext *uc = cls;
+  if (success == GNUNET_SYSERR)
+    {
+      signal_unindex_error (uc,
+                           msg);
+      return;
+    }
+  
+  GNUNET_FS_tree_encoder_next (uc->tc);
+}
+
+
+/**
+ * Function called asking for the current (encoded)
+ * block to be processed.  After processing the
+ * client should either call "GNUNET_FS_tree_encode_next"
+ * or (on error) "GNUNET_FS_tree_encode_finish".
+ *
+ * @param cls closure
+ * @param query the query for the block (key for lookup in the datastore)
+ * @param offset offset of the block
+ * @param type type of the block (IBLOCK or DBLOCK)
+ * @param block the (encrypted) block
+ * @param block_size size of block (in bytes)
+ */
+static void 
+unindex_process (void *cls,
+                const GNUNET_HashCode *query,
+                uint64_t offset,
+                uint32_t type,
+                const void *block,
+                uint16_t block_size)
+{
+  struct GNUNET_FS_UnindexContext *uc = cls;
+  uint32_t size;
+  const void *data;
+  struct OnDemandBlock odb;
+
+  if (type != GNUNET_DATASTORE_BLOCKTYPE_DBLOCK)
+    {
+      size = block_size;
+      data = block;
+    }
+  else /* on-demand encoded DBLOCK */
+    {
+      size = sizeof(struct OnDemandBlock);
+      odb.offset = offset;
+      odb.file_id = uc->file_id;
+      data = &odb;
+    }
+  GNUNET_DATASTORE_remove (uc->dsh,
+                          query,
+                          size,
+                          data,
+                          &process_cont,
+                          uc,
+                          GNUNET_CONSTANTS_SERVICE_TIMEOUT);
+}
+
+
 /**
  * Function called when the tree encoder has
  * processed all blocks.  Clean up.