off-line hack fest

3 files changed, 9 insertions, 44 deletions

diff --git a/src/include/gnunet_datacache_lib.h b/src/include/gnunet_datacache_lib.h
index 3bd76df32..e0866416d 100644
--- a/src/include/gnunet_datacache_lib.h
+++ b/src/include/gnunet_datacache_lib.h
@@ -32,6 +32,7 @@
 #define GNUNET_DATACACHE_LIB_H
 
 #include "gnunet_util_lib.h"
+#include "gnunet_block_lib.h"
 
 #ifdef __cplusplus
 extern "C"
@@ -86,7 +87,7 @@ typedef int (*GNUNET_DATACACHE_Iterator) (void *cls,
                                           const GNUNET_HashCode * key,
                                           uint32_t size,
                                           const char *data,
-                                          uint32_t type);
+                                          enum GNUNET_BLOCK_Type type);
 
 
 /**
@@ -105,7 +106,7 @@ GNUNET_DATACACHE_put (struct GNUNET_DATACACHE_Handle *h,
                       const GNUNET_HashCode * key,
                       uint32_t size,
                       const char *data,
-                      unsigned int type,
+                      enum GNUNET_BLOCK_Type type,
                       struct GNUNET_TIME_Absolute discard_time);
 
 
@@ -123,7 +124,7 @@ GNUNET_DATACACHE_put (struct GNUNET_DATACACHE_Handle *h,
 unsigned int 
 GNUNET_DATACACHE_get (struct GNUNET_DATACACHE_Handle *h,
                       const GNUNET_HashCode * key,
-                      unsigned int type, 
+                      enum GNUNET_BLOCK_Type type, 
                       GNUNET_DATACACHE_Iterator iter,
                       void *iter_cls);
 
diff --git a/src/include/gnunet_datastore_service.h b/src/include/gnunet_datastore_service.h
index 2bf0f8f34..bf18860a6 100644
--- a/src/include/gnunet_datastore_service.h
+++ b/src/include/gnunet_datastore_service.h
@@ -32,6 +32,7 @@
 #define GNUNET_DATASTORE_SERVICE_H
 
 #include "gnunet_util_lib.h"
+#include "gnunet_block_lib.h"
 
 #ifdef __cplusplus
 extern "C"
@@ -41,43 +42,6 @@ extern "C"
 #endif
 #endif
 
-/**
- * Any type of block, used as a wildcard when searching.  Should
- * never be attached to a specific block.
- */
-#define GNUNET_DATASTORE_BLOCKTYPE_ANY 0
-
-/**
- * Data block (leaf) in the CHK tree.
- */
-#define GNUNET_DATASTORE_BLOCKTYPE_DBLOCK 1
-
-/**
- * Inner block in the CHK tree.
- */
-#define GNUNET_DATASTORE_BLOCKTYPE_IBLOCK 2
-
-/**
- * Type of a block representing a keyword search result.
- */
-#define GNUNET_DATASTORE_BLOCKTYPE_KBLOCK 3
-
-/**
- * Type of a block that is used to advertise content in a namespace.
- */
-#define GNUNET_DATASTORE_BLOCKTYPE_SBLOCK 4
-
-/**
- * Type of a block representing a block to be encoded on demand from disk.
- * Should never appear on the network directly.
- */
-#define GNUNET_DATASTORE_BLOCKTYPE_ONDEMAND 5
-
-/**
- * Type of a block that is used to advertise a namespace.  
- */
-#define GNUNET_DATASTORE_BLOCKTYPE_NBLOCK 6
-
 
 /**
  * Handle to the datastore service.
@@ -171,7 +135,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,
@@ -239,7 +203,7 @@ typedef void (*GNUNET_DATASTORE_Iterator) (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
@@ -264,7 +228,7 @@ typedef void (*GNUNET_DATASTORE_Iterator) (void *cls,
 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/include/gnunet_dht_service.h b/src/include/gnunet_dht_service.h
index d14606d70..dcbe3dc98 100644
--- a/src/include/gnunet_dht_service.h
+++ b/src/include/gnunet_dht_service.h
@@ -147,7 +147,7 @@ typedef void (*GNUNET_DHT_GetIterator)(void *cls,
  * @param handle handle to the DHT service
  * @param timeout timeout for this request to be sent to the
  *        service (this is NOT a timeout for receiving responses)
- * @param type expected type of the response object (GNUNET_DATASTORE_BLOCKTYPE_*)
+ * @param type expected type of the response object (GNUNET_BLOCK_TYPE_*)
  * @param key the key to look up
  * @param iter function to call on each result
  * @param iter_cls closure for iter