X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libhashkit%2Ftypes.h;h=255620b838ed529a4fcc1ddce12370c4183a6785;hb=e8b6a3ed21315eccd4123c6eb4124fc9fbdacd36;hp=a06be2fbadf368ba0c1a9f4f0c17d6fc1ce77928;hpb=1fefa980a1f3a88df3eb1db02e2319d754aebe75;p=awesomized%2Flibmemcached

diff --git a/libhashkit/types.h b/libhashkit/types.h
index a06be2fb..255620b8 100644
--- a/libhashkit/types.h
+++ b/libhashkit/types.h
@@ -7,49 +7,25 @@
  * the COPYING file in the parent directory for full text.
  */
 
-/**
- * @file
- * @brief HashKit Header
- */
-
 #ifndef HASHKIT_TYPES_H
 #define HASHKIT_TYPES_H
 
 #ifdef __cplusplus
+
 extern "C" {
 #endif
 
-/**
- * @addtogroup hashkit_types Types
- * @ingroup hashkit
- * @{
- */
-
 typedef enum {
   HASHKIT_SUCCESS,
   HASHKIT_FAILURE,
   HASHKIT_MEMORY_ALLOCATION_FAILURE,
+  HASHKIT_INVALID_HASH,
+  HASHKIT_INVALID_ARGUMENT,
   HASHKIT_MAXIMUM_RETURN /* Always add new error code before */
 } hashkit_return_t;
 
-/**
-  @todo hashkit_options_t is for future use, currently we do not define any user options.
- */
-
-typedef enum
-{
-  HASHKIT_OPTION_MAX
-} hashkit_options_t;
-
-typedef struct
-{
-  /* We use the following for internal book keeping. */
-  bool is_initialized:1;
-  bool is_allocated:1;
-} hashkit_options_st;
-
 typedef enum {
-  HASHKIT_HASH_DEFAULT= 0,
+  HASHKIT_HASH_DEFAULT= 0, // hashkit_one_at_a_time()
   HASHKIT_HASH_MD5,
   HASHKIT_HASH_CRC,
   HASHKIT_HASH_FNV1_64,
@@ -59,6 +35,7 @@ typedef enum {
   HASHKIT_HASH_HSIEH,
   HASHKIT_HASH_MURMUR,
   HASHKIT_HASH_JENKINS,
+  HASHKIT_HASH_CUSTOM,
   HASHKIT_HASH_MAX
 } hashkit_hash_algorithm_t;
 
@@ -75,15 +52,8 @@ typedef enum
 
 
 typedef struct hashkit_st hashkit_st;
-typedef struct hashkit_continuum_point_st hashkit_continuum_point_st;
-typedef bool (hashkit_active_fn)(void *context);
-typedef uint32_t (hashkit_fn)(const char *key, size_t key_length);
-typedef size_t (hashkit_key_fn)(char *key, size_t key_length, uint32_t point_index, void *context);
-typedef void (hashkit_sort_fn)(void *context, size_t count);
-typedef uint32_t (hashkit_weight_fn)(void *context);
-
-/** @} */
 
+typedef uint32_t (*hashkit_hash_fn)(const char *key, size_t key_length, void *context);
 
 #ifdef __cplusplus
 }