X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Flibhashkit%2Ffunction.cc;h=f66a63ea50a46b5b3999ffc8b4b33cc9cbf8f93e;hb=1a82d708fca6b4c379dc035d05763ee80aae6d72;hp=c1eac35865d6d204ad87323ee7270fb52ecc8f75;hpb=95d03c7c94f6888d3c904d2321e6f526db7cff7f;p=awesomized%2Flibmemcached

diff --git a/src/libhashkit/function.cc b/src/libhashkit/function.cc
index c1eac358..f66a63ea 100644
--- a/src/libhashkit/function.cc
+++ b/src/libhashkit/function.cc
@@ -1,119 +1,101 @@
-/* HashKit
- * Copyright (C) 2010 Brian Aker
- * All rights reserved.
- *
- * Use and distribution licensed under the BSD license.  See
- * the COPYING file in the parent directory for full text.
- */
+/*
+    +--------------------------------------------------------------------+
+    | libmemcached - C/C++ Client Library for memcached                  |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted under the terms of the BSD license.    |
+    | You should have received a copy of the license in a bundled file   |
+    | named LICENSE; in case you did not receive a copy you can review   |
+    | the terms online at: https://opensource.org/licenses/BSD-3-Clause  |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2006-2014 Brian Aker   https://datadifferential.com/ |
+    | Copyright (c) 2020 Michael Wallner   <mike@php.net>                |
+    +--------------------------------------------------------------------+
+*/
 
 #include "libhashkit/common.h"
 
-static hashkit_return_t _set_function(struct hashkit_st::hashkit_function_st *self, hashkit_hash_algorithm_t hash_algorithm)
-{
-  if (self == NULL)
-  {
+static hashkit_return_t _set_function(struct hashkit_st::hashkit_function_st *self,
+                                      hashkit_hash_algorithm_t hash_algorithm) {
+  if (self == NULL) {
     return HASHKIT_INVALID_ARGUMENT;
   }
 
-  switch (hash_algorithm)
-  {
-  case HASHKIT_HASH_MD5:
-    self->function= hashkit_md5;
-    break;
+  switch (hash_algorithm) {
+  case HASHKIT_HASH_MD5: self->function = hashkit_md5; break;
 
-  case HASHKIT_HASH_CRC:
-    self->function= hashkit_crc32;
-    break;
+  case HASHKIT_HASH_CRC: self->function = hashkit_crc32; break;
 
   case HASHKIT_HASH_FNV1_64:
-    if (libhashkit_has_algorithm(HASHKIT_HASH_FNV1_64))
-    {
-      self->function= hashkit_fnv1_64;
+    if (libhashkit_has_algorithm(HASHKIT_HASH_FNV1_64)) {
+      self->function = hashkit_fnv1_64;
       break;
     }
     return HASHKIT_INVALID_ARGUMENT;
 
   case HASHKIT_HASH_FNV1A_64:
-    if (libhashkit_has_algorithm(HASHKIT_HASH_FNV1_64))
-    {
-      self->function= hashkit_fnv1a_64;
+    if (libhashkit_has_algorithm(HASHKIT_HASH_FNV1_64)) {
+      self->function = hashkit_fnv1a_64;
       break;
     }
     return HASHKIT_INVALID_ARGUMENT;
 
-  case HASHKIT_HASH_FNV1_32:
-    self->function= hashkit_fnv1_32;
-    break;
+  case HASHKIT_HASH_FNV1_32: self->function = hashkit_fnv1_32; break;
 
-  case HASHKIT_HASH_FNV1A_32:
-    self->function= hashkit_fnv1a_32;
-    break;
+  case HASHKIT_HASH_FNV1A_32: self->function = hashkit_fnv1a_32; break;
 
   case HASHKIT_HASH_HSIEH:
-    if (libhashkit_has_algorithm(HASHKIT_HASH_HSIEH))
-    {
-      self->function= hashkit_hsieh;
-      break;    
+    if (libhashkit_has_algorithm(HASHKIT_HASH_HSIEH)) {
+      self->function = hashkit_hsieh;
+      break;
     }
     return HASHKIT_INVALID_ARGUMENT;
 
   case HASHKIT_HASH_MURMUR3:
-    if (libhashkit_has_algorithm(HASHKIT_HASH_MURMUR3))
-    {
-      self->function= hashkit_murmur3;
+    if (libhashkit_has_algorithm(HASHKIT_HASH_MURMUR3)) {
+      self->function = hashkit_murmur3;
       break;
     }
     return HASHKIT_INVALID_ARGUMENT;
   case HASHKIT_HASH_MURMUR:
-    if (libhashkit_has_algorithm(HASHKIT_HASH_MURMUR))
-    {
-      self->function= hashkit_murmur;
-      break;    
+    if (libhashkit_has_algorithm(HASHKIT_HASH_MURMUR)) {
+      self->function = hashkit_murmur;
+      break;
     }
     return HASHKIT_INVALID_ARGUMENT;
 
-  case HASHKIT_HASH_JENKINS:
-    self->function= hashkit_jenkins;
-    break;    
+  case HASHKIT_HASH_JENKINS: self->function = hashkit_jenkins; break;
 
-  case HASHKIT_HASH_CUSTOM:
-    return HASHKIT_INVALID_ARGUMENT;
+  case HASHKIT_HASH_CUSTOM: return HASHKIT_INVALID_ARGUMENT;
 
-  case HASHKIT_HASH_DEFAULT:
-    self->function= hashkit_one_at_a_time;
-    break;
+  case HASHKIT_HASH_DEFAULT: self->function = hashkit_one_at_a_time; break;
 
-  case HASHKIT_HASH_MAX:
-    self->function= hashkit_one_at_a_time;
-    return HASHKIT_INVALID_HASH;
+  case HASHKIT_HASH_MAX: self->function = hashkit_one_at_a_time; return HASHKIT_INVALID_HASH;
   }
 
-  self->context= NULL;
+  self->context = NULL;
 
   return HASHKIT_SUCCESS;
 }
 
-hashkit_return_t hashkit_set_function(hashkit_st *self, hashkit_hash_algorithm_t hash_algorithm)
-{
+hashkit_return_t hashkit_set_function(hashkit_st *self, hashkit_hash_algorithm_t hash_algorithm) {
   return _set_function(&self->base_hash, hash_algorithm);
 }
 
-hashkit_return_t hashkit_set_distribution_function(hashkit_st *self, hashkit_hash_algorithm_t hash_algorithm)
-{
+hashkit_return_t hashkit_set_distribution_function(hashkit_st *self,
+                                                   hashkit_hash_algorithm_t hash_algorithm) {
   return _set_function(&self->distribution_hash, hash_algorithm);
 }
 
-static hashkit_return_t _set_custom_function(struct hashkit_st::hashkit_function_st *self, hashkit_hash_fn function, void *context)
-{
-  if (self == NULL)
-  {
+static hashkit_return_t _set_custom_function(struct hashkit_st::hashkit_function_st *self,
+                                             hashkit_hash_fn function, void *context) {
+  if (self == NULL) {
     return HASHKIT_INVALID_ARGUMENT;
   }
 
-  if (function)
-  {
-    self->function= function;
-    self->context= context;
+  if (function) {
+    self->function = function;
+    self->context = context;
 
     return HASHKIT_SUCCESS;
   }
@@ -121,91 +103,62 @@ static hashkit_return_t _set_custom_function(struct hashkit_st::hashkit_function
   return HASHKIT_FAILURE;
 }
 
-hashkit_return_t hashkit_set_custom_function(hashkit_st *self, hashkit_hash_fn function, void *context)
-{
-  if (self == NULL)
-  {
+hashkit_return_t hashkit_set_custom_function(hashkit_st *self, hashkit_hash_fn function,
+                                             void *context) {
+  if (self == NULL) {
     return HASHKIT_INVALID_ARGUMENT;
   }
 
-
   return _set_custom_function(&self->base_hash, function, context);
 }
 
-hashkit_return_t hashkit_set_custom_distribution_function(hashkit_st *self, hashkit_hash_fn function, void *context)
-{
-  if (self == NULL)
-  {
+hashkit_return_t hashkit_set_custom_distribution_function(hashkit_st *self,
+                                                          hashkit_hash_fn function, void *context) {
+  if (self == NULL) {
     return HASHKIT_INVALID_ARGUMENT;
   }
 
   return _set_custom_function(&self->distribution_hash, function, context);
 }
 
-static hashkit_hash_algorithm_t get_function_type(const hashkit_hash_fn function)
-{
-  if (function == hashkit_one_at_a_time)
-  {
+static hashkit_hash_algorithm_t get_function_type(const hashkit_hash_fn function) {
+  if (function == hashkit_one_at_a_time) {
     return HASHKIT_HASH_DEFAULT;
-  }
-  else if (function == hashkit_md5)
-  {
+  } else if (function == hashkit_md5) {
     return HASHKIT_HASH_MD5;
-  }
-  else if (function == hashkit_crc32)
-  {
+  } else if (function == hashkit_crc32) {
     return HASHKIT_HASH_CRC;
-  }
-  else if (function == hashkit_fnv1_64)
-  {
+  } else if (function == hashkit_fnv1_64) {
     return HASHKIT_HASH_FNV1_64;
-  }
-  else if (function == hashkit_fnv1a_64)
-  {
+  } else if (function == hashkit_fnv1a_64) {
     return HASHKIT_HASH_FNV1A_64;
-  }
-  else if (function == hashkit_fnv1_32)
-  {
+  } else if (function == hashkit_fnv1_32) {
     return HASHKIT_HASH_FNV1_32;
-  }
-  else if (function == hashkit_fnv1a_32)
-  {
+  } else if (function == hashkit_fnv1a_32) {
     return HASHKIT_HASH_FNV1A_32;
-  }
-  else if (function == hashkit_hsieh)
-  {
+  } else if (function == hashkit_hsieh) {
     return HASHKIT_HASH_HSIEH;
-  }
-  else if (function == hashkit_murmur)
-  {
+  } else if (function == hashkit_murmur) {
     return HASHKIT_HASH_MURMUR;
-  }
-  else if (function == hashkit_murmur3)
-  {
+  } else if (function == hashkit_murmur3) {
     return HASHKIT_HASH_MURMUR3;
-  }
-  else if (function == hashkit_jenkins)
-  {
+  } else if (function == hashkit_jenkins) {
     return HASHKIT_HASH_JENKINS;
   }
 
   return HASHKIT_HASH_CUSTOM;
 }
 
-hashkit_hash_algorithm_t hashkit_get_function(const hashkit_st *self)
-{
-  if (self == NULL)
-  {
+hashkit_hash_algorithm_t hashkit_get_function(const hashkit_st *self) {
+  if (self == NULL) {
     return HASHKIT_HASH_DEFAULT;
   }
 
   return get_function_type(self->base_hash.function);
 }
 
-hashkit_hash_algorithm_t hashkit_get_distribution_function(const hashkit_st *self)
-{
-  if (self == NULL)
-  {
+hashkit_hash_algorithm_t hashkit_get_distribution_function(const hashkit_st *self) {
+  if (self == NULL) {
     return HASHKIT_HASH_DEFAULT;
   }