X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libhashkit%2Fhashkit.h;h=9b8761f1c32a53777c882d82a6de16a3f59e304b;hb=28adf7b936c6f5c25b7526ff56ec1256da1246d4;hp=e3d5862e905f6f5867bde504e83a9136f87009c1;hpb=56bb95c23210147d45b792e4e494e995d9de76dc;p=awesomized%2Flibmemcached

diff --git a/libhashkit/hashkit.h b/libhashkit/hashkit.h
index e3d5862e..9b8761f1 100644
--- a/libhashkit/hashkit.h
+++ b/libhashkit/hashkit.h
@@ -1,13 +1,42 @@
-/* HashKit
- * Copyright (C) 2009-2010 Brian Aker
- * All rights reserved.
+/*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+ * 
+ *  HashKit library
+ *
+ *  Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ *  Copyright (C) 2009-2010 Brian Aker All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *      * Redistributions of source code must retain the above copyright
+ *  notice, this list of conditions and the following disclaimer.
+ *
+ *      * Redistributions in binary form must reproduce the above
+ *  copyright notice, this list of conditions and the following disclaimer
+ *  in the documentation and/or other materials provided with the
+ *  distribution.
+ *
+ *      * The names of its contributors may not be used to endorse or
+ *  promote products derived from this software without specific prior
+ *  written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * Use and distribution licensed under the BSD license.  See
- * the COPYING file in the parent directory for full text.
  */
 
-#ifndef HASHKIT_H
-#define HASHKIT_H
+
+#pragma once
 
 
 #if !defined(__cplusplus)
@@ -15,6 +44,7 @@
 #endif
 #include <inttypes.h>
 #include <sys/types.h>
+
 #include <libhashkit/visibility.h>
 #include <libhashkit/configure.h>
 #include <libhashkit/types.h>
@@ -22,12 +52,26 @@
 #include <libhashkit/behavior.h>
 #include <libhashkit/digest.h>
 #include <libhashkit/function.h>
+#include <libhashkit/str_algorithm.h>
 #include <libhashkit/strerror.h>
 
-#ifdef __cplusplus
+struct hashkit_st
+{
+  struct hashkit_function_st {
+    hashkit_hash_fn function;
+    void *context;
+  } base_hash, distribution_hash;
+
+  struct {
+    bool is_base_same_distributed:1;
+  } flags;
 
-#include <string>
+  struct {
+    bool is_allocated:1;
+  } options;
+};
 
+#ifdef __cplusplus
 extern "C" {
 #endif
 
@@ -49,77 +93,3 @@ void hashkit_free(hashkit_st *hash);
 #ifdef __cplusplus
 } // extern "C"
 #endif
-
-struct hashkit_st
-{
-  struct hashkit_function_st {
-    hashkit_hash_fn function;
-    void *context;
-  } base_hash, distribution_hash;
-
-  struct {
-    bool is_base_same_distributed HASHKIT_BITFIELD;
-  } flags;
-
-  struct {
-    bool is_allocated HASHKIT_BITFIELD;
-  } options;
-};
-
-#ifdef __cplusplus
-class Hashkit : private hashkit_st {
-
-public:
-
-  Hashkit()
-  {
-    hashkit_create(this);
-  }
-
-  Hashkit(const Hashkit& source)
-  {
-    hashkit_clone(this, &source);
-  }
-
-  Hashkit& operator=(const Hashkit& source)
-  {
-    hashkit_free(this);
-    hashkit_clone(this, &source);
-
-    return *this;
-  }
-
-  friend bool operator==(const Hashkit &left, const Hashkit &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()
-  {
-    hashkit_free(this);
-  }
-};
-#endif
-
-
-#endif /* HASHKIT_H */