9 files changed, 70 insertions, 69 deletions

diff --git a/src/datastore/datastore_api.c b/src/datastore/datastore_api.c
index 7e7bf02c8..1c50dabee 100644
--- a/src/datastore/datastore_api.c
+++ b/src/datastore/datastore_api.c
@@ -319,7 +319,7 @@ GNUNET_DATASTORE_put (struct GNUNET_DATASTORE_Handle *h,
                       const GNUNET_HashCode * key,
                       uint32_t size,
                       const void *data,
-                      uint32_t type,
+                      enum GNUNET_BLOCK_Type type,
                       uint32_t priority,
                       uint32_t anonymity,
                       struct GNUNET_TIME_Absolute expiration,
@@ -668,7 +668,7 @@ transmit_for_result (struct GNUNET_DATASTORE_Handle *h,
 void
 GNUNET_DATASTORE_get (struct GNUNET_DATASTORE_Handle *h,
                       const GNUNET_HashCode * key,
-                      uint32_t type,
+                      enum GNUNET_BLOCK_Type type,
                       GNUNET_DATASTORE_Iterator iter, void *iter_cls,
                       struct GNUNET_TIME_Relative timeout)
 {
diff --git a/src/datastore/gnunet-service-datastore.c b/src/datastore/gnunet-service-datastore.c
index 79fcd70e9..6d0f29671 100644
--- a/src/datastore/gnunet-service-datastore.c
+++ b/src/datastore/gnunet-service-datastore.c
@@ -288,7 +288,7 @@ expired_processor (void *cls,
                    const GNUNET_HashCode * key,
                    uint32_t size,
                    const void *data,
-                   uint32_t type,
+                   enum GNUNET_BLOCK_Type type,
                    uint32_t priority,
                    uint32_t anonymity,
                    struct GNUNET_TIME_Absolute
@@ -375,7 +375,7 @@ manage (void *cls,
         const GNUNET_HashCode * key,
         uint32_t size,
         const void *data,
-        uint32_t type,
+        enum GNUNET_BLOCK_Type type,
         uint32_t priority,
         uint32_t anonymity,
         struct GNUNET_TIME_Absolute
@@ -644,7 +644,7 @@ transmit_item (void *cls,
                const GNUNET_HashCode * key,
                uint32_t size,
                const void *data,
-               uint32_t type,
+               enum GNUNET_BLOCK_Type type,
                uint32_t priority,
                uint32_t anonymity,
                struct GNUNET_TIME_Absolute
@@ -1094,7 +1094,7 @@ remove_callback (void *cls,
                  const GNUNET_HashCode * key,
                  uint32_t size,
                  const void *data,
-                 uint32_t type,
+                 enum GNUNET_BLOCK_Type type,
                  uint32_t priority,
                  uint32_t anonymity,
                  struct GNUNET_TIME_Absolute
diff --git a/src/datastore/perf_datastore_api.c b/src/datastore/perf_datastore_api.c
index 93e875c8c..b92fefe4d 100644
--- a/src/datastore/perf_datastore_api.c
+++ b/src/datastore/perf_datastore_api.c
@@ -198,7 +198,7 @@ delete_value (void *cls,
               const GNUNET_HashCode * key,
               uint32_t size,
               const void *data,
-              uint32_t type,
+              enum GNUNET_BLOCK_Type type,
               uint32_t priority,
               uint32_t anonymity,
               struct GNUNET_TIME_Absolute
diff --git a/src/datastore/perf_plugin_datastore.c b/src/datastore/perf_plugin_datastore.c
index a23569875..ea1df5efa 100644
--- a/src/datastore/perf_plugin_datastore.c
+++ b/src/datastore/perf_plugin_datastore.c
@@ -140,7 +140,7 @@ iterateDummy (void *cls,
               const GNUNET_HashCode * key,
               uint32_t size,
               const void *data,
-              uint32_t type,
+              enum GNUNET_BLOCK_Type type,
               uint32_t priority,
               uint32_t anonymity,
               struct GNUNET_TIME_Absolute
diff --git a/src/datastore/plugin_datastore.h b/src/datastore/plugin_datastore.h
index 775a6641a..e8f433671 100644
--- a/src/datastore/plugin_datastore.h
+++ b/src/datastore/plugin_datastore.h
@@ -30,6 +30,7 @@
 #ifndef PLUGIN_DATASTORE_H
 #define PLUGIN_DATASTORE_H
 
+#include "gnunet_block_lib.h"
 #include "gnunet_configuration_lib.h"
 #include "gnunet_datastore_service.h"
 #include "gnunet_statistics_service.h"
@@ -103,7 +104,7 @@ typedef int (*PluginIterator) (void *cls,
                                const GNUNET_HashCode * key,
                                uint32_t size,
                                const void *data,
-                               uint32_t type,
+                               enum GNUNET_BLOCK_Type type,
                                uint32_t priority,
                                uint32_t anonymity,
                                struct GNUNET_TIME_Absolute
@@ -142,7 +143,7 @@ typedef int (*PluginPut) (void *cls,
                           const GNUNET_HashCode * key,
                           uint32_t size,
                           const void *data,
-                          uint32_t type,
+                          enum GNUNET_BLOCK_Type type,
                           uint32_t priority,
                           uint32_t anonymity,
                           struct GNUNET_TIME_Absolute expiration,
@@ -173,7 +174,7 @@ typedef int (*PluginPut) (void *cls,
 typedef void (*PluginGet) (void *cls,
                            const GNUNET_HashCode * key,
                            const GNUNET_HashCode * vhash,
-                           uint32_t type,
+                           enum GNUNET_BLOCK_Type type,
                            PluginIterator iter, void *iter_cls);
 
 
@@ -222,7 +223,7 @@ typedef int (*PluginUpdate) (void *cls,
  * @param iter_cls closure for iter
  */
 typedef void (*PluginSelector) (void *cls,
-                                uint32_t type,
+                                enum GNUNET_BLOCK_Type type,
                                 PluginIterator iter,
                                 void *iter_cls);
 
diff --git a/src/datastore/plugin_datastore_sqlite.c b/src/datastore/plugin_datastore_sqlite.c
index 0d4170e56..824b74ad2 100644
--- a/src/datastore/plugin_datastore_sqlite.c
+++ b/src/datastore/plugin_datastore_sqlite.c
@@ -719,7 +719,7 @@ sqlite_plugin_put (void *cls,
                    const GNUNET_HashCode * key,
                    uint32_t size,
                    const void *data,
-                   uint32_t type,
+                   enum GNUNET_BLOCK_Type type,
                    uint32_t priority,
                    uint32_t anonymity,
                    struct GNUNET_TIME_Absolute expiration,
@@ -892,7 +892,7 @@ struct IterContext
   /**
    * Desired type for blocks returned by this iterator.
    */
-  uint32_t type;
+  enum GNUNET_BLOCK_Type type;
 };
 
 
@@ -1026,7 +1026,7 @@ iter_next_prepare (void *cls,
  */
 static void
 basic_iter (struct Plugin *plugin,
-            uint32_t type,
+            enum GNUNET_BLOCK_Type type,
             int is_asc,
             int is_prio,
             int is_migr,
@@ -1110,7 +1110,7 @@ basic_iter (struct Plugin *plugin,
  */
 static void
 sqlite_plugin_iter_low_priority (void *cls,
-                                 uint32_t type,
+                                 enum GNUNET_BLOCK_Type type,
                                  PluginIterator iter,
                                  void *iter_cls)
 {
@@ -1137,7 +1137,7 @@ sqlite_plugin_iter_low_priority (void *cls,
  */
 static void
 sqlite_plugin_iter_zero_anonymity (void *cls,
-                                   uint32_t type,
+                                   enum GNUNET_BLOCK_Type type,
                                    PluginIterator iter,
                                    void *iter_cls)
 {
@@ -1176,7 +1176,7 @@ sqlite_plugin_iter_zero_anonymity (void *cls,
  */
 static void
 sqlite_plugin_iter_ascending_expiration (void *cls,
-                                         uint32_t type,
+                                         enum GNUNET_BLOCK_Type type,
                                          PluginIterator iter,
                                          void *iter_cls)
 {
@@ -1213,7 +1213,7 @@ sqlite_plugin_iter_ascending_expiration (void *cls,
  */
 static void
 sqlite_plugin_iter_migration_order (void *cls,
-                                    uint32_t type,
+                                    enum GNUNET_BLOCK_Type type,
                                     PluginIterator iter,
                                     void *iter_cls)
 {
@@ -1288,7 +1288,7 @@ all_next_prepare (void *cls,
  */
 static void
 sqlite_plugin_iter_all_now (void *cls,
-                            uint32_t type,
+                            enum GNUNET_BLOCK_Type type,
                             PluginIterator iter,
                             void *iter_cls)
 {
@@ -1439,7 +1439,7 @@ static void
 sqlite_plugin_get (void *cls,
                    const GNUNET_HashCode * key,
                    const GNUNET_HashCode * vhash,
-                   uint32_t type,
+                   enum GNUNET_BLOCK_Type type,
                    PluginIterator iter, void *iter_cls)
 {
   struct Plugin *plugin = cls;
diff --git a/src/datastore/plugin_datastore_template.c b/src/datastore/plugin_datastore_template.c
index 6439bc019..7656f6a7d 100644
--- a/src/datastore/plugin_datastore_template.c
+++ b/src/datastore/plugin_datastore_template.c
@@ -70,12 +70,12 @@ static unsigned long long template_plugin_get_size (void *cls)
  */
 static int
 template_plugin_put (void *cls,
-                   const GNUNET_HashCode * key,
-                   uint32_t size,
-                   const void *data,
-                   uint32_t type,
-                   uint32_t priority,
-                   uint32_t anonymity,
+                     const GNUNET_HashCode * key,
+                     uint32_t size,
+                     const void *data,
+                     enum GNUNET_BLOCK_Type type,
+                     uint32_t priority,
+                     uint32_t anonymity,
                      struct GNUNET_TIME_Absolute expiration,
                      char **msg)
 {
@@ -126,7 +126,7 @@ static void
 template_plugin_get (void *cls,
                      const GNUNET_HashCode * key,
                      const GNUNET_HashCode * vhash,
-                     uint32_t type,
+                     enum GNUNET_BLOCK_Type type,
                      PluginIterator iter, void *iter_cls)
 {
   GNUNET_break (0);
@@ -181,7 +181,7 @@ template_plugin_update (void *cls,
  */
 static void
 template_plugin_iter_low_priority (void *cls,
-                                   uint32_t type,
+                                   enum GNUNET_BLOCK_Type type,
                                    PluginIterator iter,
                                    void *iter_cls)
 {
@@ -203,9 +203,9 @@ template_plugin_iter_low_priority (void *cls,
  */
 static void
 template_plugin_iter_zero_anonymity (void *cls,
-                        uint32_t type,
-                        PluginIterator iter,
-                        void *iter_cls)
+                                     enum GNUNET_BLOCK_Type type,
+                                     PluginIterator iter,
+                                     void *iter_cls)
 {
   GNUNET_break (0);
 }
@@ -225,9 +225,9 @@ template_plugin_iter_zero_anonymity (void *cls,
  */
 static void
 template_plugin_iter_ascending_expiration (void *cls,
-                        uint32_t type,
-                        PluginIterator iter,
-                        void *iter_cls)
+                                           enum GNUNET_BLOCK_Type type,
+                                           PluginIterator iter,
+                                           void *iter_cls)
 {
   GNUNET_break (0);
 }
@@ -247,9 +247,9 @@ template_plugin_iter_ascending_expiration (void *cls,
  */
 static void
 template_plugin_iter_migration_order (void *cls,
-                        uint32_t type,
-                        PluginIterator iter,
-                        void *iter_cls)
+                                      enum GNUNET_BLOCK_Type type,
+                                      PluginIterator iter,
+                                      void *iter_cls)
 {
   GNUNET_break (0);
 }
@@ -269,9 +269,9 @@ template_plugin_iter_migration_order (void *cls,
  */
 static void
 template_plugin_iter_all_now (void *cls,
-                        uint32_t type,
-                        PluginIterator iter,
-                        void *iter_cls)
+                              enum GNUNET_BLOCK_Type type,
+                              PluginIterator iter,
+                              void *iter_cls)
 {
   GNUNET_break (0);
 }
diff --git a/src/datastore/test_datastore_api.c b/src/datastore/test_datastore_api.c
index 74c2ae206..07f1dc426 100644
--- a/src/datastore/test_datastore_api.c
+++ b/src/datastore/test_datastore_api.c
@@ -174,7 +174,7 @@ check_value (void *cls,
              const GNUNET_HashCode * key,
              uint32_t size,
              const void *data,
-             uint32_t type,
+             enum GNUNET_BLOCK_Type type,
              uint32_t priority,
              uint32_t anonymity,
              struct GNUNET_TIME_Absolute
@@ -209,14 +209,14 @@ check_value (void *cls,
 
 static void 
 delete_value (void *cls,
-             const GNUNET_HashCode * key,
-             uint32_t size,
-             const void *data,
-             uint32_t type,
-             uint32_t priority,
-             uint32_t anonymity,
-             struct GNUNET_TIME_Absolute
-             expiration, uint64_t uid)
+              const GNUNET_HashCode * key,
+              uint32_t size,
+              const void *data,
+              enum GNUNET_BLOCK_Type type,
+              uint32_t priority,
+              uint32_t anonymity,
+              struct GNUNET_TIME_Absolute
+              expiration, uint64_t uid)
 {
   struct CpsRunContext *crc = cls;
   if (key == NULL)
@@ -239,14 +239,14 @@ delete_value (void *cls,
 
 static void 
 check_nothing (void *cls,
-             const GNUNET_HashCode * key,
-             uint32_t size,
-             const void *data,
-             uint32_t type,
-             uint32_t priority,
-             uint32_t anonymity,
-             struct GNUNET_TIME_Absolute
-             expiration, uint64_t uid)
+               const GNUNET_HashCode * key,
+               uint32_t size,
+               const void *data,
+               enum GNUNET_BLOCK_Type type,
+               uint32_t priority,
+               uint32_t anonymity,
+               struct GNUNET_TIME_Absolute
+               expiration, uint64_t uid)
 {
   struct CpsRunContext *crc = cls;
   GNUNET_assert (key == NULL);
@@ -266,7 +266,7 @@ check_multiple (void *cls,
                 const GNUNET_HashCode * key,
                 uint32_t size,
                 const void *data,
-                uint32_t type,
+                enum GNUNET_BLOCK_Type type,
                 uint32_t priority,
                 uint32_t anonymity,
                 struct GNUNET_TIME_Absolute
@@ -296,7 +296,7 @@ check_update (void *cls,
               const GNUNET_HashCode * key,
               uint32_t size,
               const void *data,
-              uint32_t type,
+              enum GNUNET_BLOCK_Type type,
               uint32_t priority,
               uint32_t anonymity,
               struct GNUNET_TIME_Absolute
diff --git a/src/datastore/test_datastore_api_management.c b/src/datastore/test_datastore_api_management.c
index 62d1e5d26..169cef554 100644
--- a/src/datastore/test_datastore_api_management.c
+++ b/src/datastore/test_datastore_api_management.c
@@ -144,7 +144,7 @@ check_value (void *cls,
              const GNUNET_HashCode * key,
              uint32_t size,
              const void *data,
-             uint32_t type,
+             enum GNUNET_BLOCK_Type type,
              uint32_t priority,
              uint32_t anonymity,
              struct GNUNET_TIME_Absolute
@@ -189,14 +189,14 @@ check_value (void *cls,
 
 static void 
 check_nothing (void *cls,
-             const GNUNET_HashCode * key,
-             uint32_t size,
-             const void *data,
-             uint32_t type,
-             uint32_t priority,
-             uint32_t anonymity,
-             struct GNUNET_TIME_Absolute
-             expiration, uint64_t uid)
+               const GNUNET_HashCode * key,
+               uint32_t size,
+               const void *data,
+               enum GNUNET_BLOCK_Type type,
+               uint32_t priority,
+               uint32_t anonymity,
+               struct GNUNET_TIME_Absolute
+               expiration, uint64_t uid)
 {
   struct CpsRunContext *crc = cls;