Style cleanup.

[awesomized/libmemcached] / libhashkit / hashkit.h

diff --git a/libhashkit/hashkit.h b/libhashkit/hashkit.h
index 9b0b32efda6bcd00e7c66bc8deb3b334596b7f0c..5f19f9d34af3221da3a6f564f5a076940eb038ce 100644 (file)
--- a/libhashkit/hashkit.h
+++ b/libhashkit/hashkit.h
@@ -1,5 +1,5 @@
 /* HashKit
- * Copyright (C) 2009 Brian Aker
+ * Copyright (C) 2009-2010 Brian Aker
  * All rights reserved.
  *
  * Use and distribution licensed under the BSD license.  See
@@ -9,6 +9,7 @@
 #ifndef HASHKIT_H
 #define HASHKIT_H
 
+
 #if !defined(__cplusplus)
 # include <stdbool.h>
 #endif
@@ -18,23 +19,16 @@
 #include <libhashkit/types.h>
 #include <libhashkit/algorithm.h>
 #include <libhashkit/behavior.h>
+#include <libhashkit/digest.h>
+#include <libhashkit/function.h>
 #include <libhashkit/strerror.h>
 
 #ifdef __cplusplus
-extern "C" {
-#endif
 
-struct hashkit_st
-{
-  struct {
-    hashkit_hash_fn function;
-    void *context;
-  } base_hash;
+#include <string>
 
-  struct {
-    bool is_allocated:1;
-  } options;
-};
+extern "C" {
+#endif
 
 HASHKIT_API
 hashkit_st *hashkit_create(hashkit_st *hash);
@@ -48,28 +42,87 @@ bool hashkit_compare(const hashkit_st *first, const hashkit_st *second);
 HASHKIT_API
 void hashkit_free(hashkit_st *hash);
 
-HASHKIT_API
-uint32_t hashkit_generate_value(const hashkit_st *self, const char *key, size_t key_length);
-
-HASHKIT_API
-hashkit_return_t hashkit_set_base_function(hashkit_st *hash, hashkit_hash_algorithm_t hash_algorithm);
-
-HASHKIT_API
-hashkit_hash_algorithm_t hashkit_get_base_function(const hashkit_st *hash);
+#define hashkit_is_allocated(__object) ((__object)->options.is_allocated)
+#define hashkit_is_initialized(__object) ((__object)->options.is_initialized)
 
-HASHKIT_API
-hashkit_return_t hashkit_set_base_function_custom(hashkit_st *hash, hashkit_hash_fn function, void *context);
+#ifdef __cplusplus
+} // extern "C"
+#endif
 
-HASHKIT_API
-uint32_t libhashkit_generate_value(const char *key, size_t key_length, hashkit_hash_algorithm_t hash_algorithm);
+struct hashkit_st
+{
+  struct hashkit_function_st {
+    hashkit_hash_fn function;
+    void *context;
+  } base_hash, distribution_hash;
 
-#define hashkit_is_allocated(__object) ((__object)->options.is_allocated)
-#define hashkit_is_initialized(__object) ((__object)->options.is_initialized)
+  struct {
+    bool is_base_same_distributed:1;
+  } flags;
 
-/** @} */
+  struct {
+    bool is_allocated:1;
+  } options;
 
 #ifdef __cplusplus
-}
+
+  hashkit_st() :
+    base_hash(),
+    distribution_hash(),
+    flags(),
+    options()
+  {
+    hashkit_create(this);
+  }
+
+  hashkit_st(const hashkit_st& source) :
+    base_hash(),
+    distribution_hash(),
+    flags(),
+    options()
+  {
+    hashkit_clone(this, &source);
+  }
+
+  hashkit_st& operator=(const hashkit_st& source)
+  { 
+    hashkit_free(this);
+    hashkit_clone(this, &source);
+
+    return *this;
+  }
+
+  friend bool operator==(const hashkit_st &left, const hashkit_st &right)
+  {
+    return hashkit_compare(&left, &right);
+  }
+
+  uint32_t digest(std::string& str)
+  {
+    return hashkit_digest(this, str.c_str(), str.length());
+  }
+
+  uint32_t digest(const char *key, size_t key_length)
+  {
+    return hashkit_digest(this, key, key_length);
+  }
+
+  hashkit_return_t set_function(hashkit_hash_algorithm_t hash_algorithm)
+  {
+    return hashkit_set_function(this, hash_algorithm);
+  }
+
+  hashkit_return_t set_distribution_function(hashkit_hash_algorithm_t hash_algorithm)
+  {
+    return hashkit_set_function(this, hash_algorithm);
+  }
+
+  ~hashkit_st()
+  {
+    hashkit_free(this);
+  }
 #endif
+};
+
 
 #endif /* HASHKIT_H */