indentation

[oweals/gnunet.git] / src / include / gnunet_datacache_lib.h

diff --git a/src/include/gnunet_datacache_lib.h b/src/include/gnunet_datacache_lib.h
index 3bd76df3284a0ef5e228a8dfff0f0fc65886d14c..a1712b80983c3912aa8f807adbacbf544e9f6071 100644 (file)
--- 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"
@@ -51,15 +52,14 @@ struct GNUNET_DATACACHE_Handle;
 /**
  * Create a data cache.
  *
- * @param sched scheduler to use
  * @param cfg configuration to use
  * @param section section in the configuration that contains our options
  * @return handle to use to access the service
  */
-struct GNUNET_DATACACHE_Handle *
-GNUNET_DATACACHE_create (struct GNUNET_SCHEDULER_Handle *sched,
-                        const struct GNUNET_CONFIGURATION_Handle *cfg,
-                        const char *section);
+struct GNUNET_DATACACHE_Handle *GNUNET_DATACACHE_create (const struct
+                                                         GNUNET_CONFIGURATION_Handle
+                                                         *cfg,
+                                                         const char *section);
 
 
 /**
@@ -82,11 +82,11 @@ void GNUNET_DATACACHE_destroy (struct GNUNET_DATACACHE_Handle *h);
  * @return GNUNET_OK to continue iterating, GNUNET_SYSERR to abort
  */
 typedef int (*GNUNET_DATACACHE_Iterator) (void *cls,
-                                         struct GNUNET_TIME_Absolute exp,
-                                         const GNUNET_HashCode * key,
-                                         uint32_t size,
-                                         const char *data,
-                                         uint32_t type);
+                                          struct GNUNET_TIME_Absolute exp,
+                                          const GNUNET_HashCode * key,
+                                          size_t size,
+                                          const char *data,
+                                          enum GNUNET_BLOCK_Type type);
 
 
 /**
@@ -100,13 +100,13 @@ typedef int (*GNUNET_DATACACHE_Iterator) (void *cls,
  * @param discard_time when to discard the value in any case
  * @return GNUNET_OK on success, GNUNET_SYSERR on error (full, etc.)
  */
-int 
+int
 GNUNET_DATACACHE_put (struct GNUNET_DATACACHE_Handle *h,
-                     const GNUNET_HashCode * key,
-                     uint32_t size,
-                     const char *data,
-                     unsigned int type,
-                     struct GNUNET_TIME_Absolute discard_time);
+                      const GNUNET_HashCode * key,
+                      size_t size,
+                      const char *data,
+                      enum GNUNET_BLOCK_Type type,
+                      struct GNUNET_TIME_Absolute discard_time);
 
 
 /**
@@ -120,12 +120,11 @@ GNUNET_DATACACHE_put (struct GNUNET_DATACACHE_Handle *h,
  * @param iter_cls closure for iter
  * @return the number of results found
  */
-unsigned int 
+unsigned int
 GNUNET_DATACACHE_get (struct GNUNET_DATACACHE_Handle *h,
-                     const GNUNET_HashCode * key,
-                     unsigned int type, 
-                     GNUNET_DATACACHE_Iterator iter,
-                     void *iter_cls);
+                      const GNUNET_HashCode * key,
+                      enum GNUNET_BLOCK_Type type,
+                      GNUNET_DATACACHE_Iterator iter, void *iter_cls);
 
 
 #if 0                           /* keep Emacsens' auto-indent happy */