X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Flibmemcached%2Fnamespace.cc;h=d748eeed1399d9b9697cfffa7052af1828041cde;hb=4b7c2c7987bbac32560395e199fe3879c1fb3991;hp=2ddd38ed9215560df7df7976f7d417d4b3cd911f;hpb=28c4d79e109e11d7d2a9f3189de57da28302ec68;p=awesomized%2Flibmemcached

diff --git a/src/libmemcached/namespace.cc b/src/libmemcached/namespace.cc
index 2ddd38ed..d748eeed 100644
--- a/src/libmemcached/namespace.cc
+++ b/src/libmemcached/namespace.cc
@@ -1,92 +1,62 @@
-/*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- * 
- *  Libmemcached library
- *
- *  Copyright (C) 2011 Data Differential, http://datadifferential.com/
- *  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.
- *
- */
+/*
+    +--------------------------------------------------------------------+
+    | libmemcached-awesome - 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-2021 Michael Wallner        https://awesome.co/ |
+    +--------------------------------------------------------------------+
+*/
 
 #include "libmemcached/common.h"
 #include "libmemcached/assert.hpp"
 
-memcached_return_t memcached_set_namespace(Memcached& memc, const char *key, size_t key_length)
-{
-  if (key and key_length == 0)
-  { 
+memcached_return_t memcached_set_namespace(Memcached &memc, const char *key, size_t key_length) {
+  if (key and key_length == 0) {
     WATCHPOINT_ASSERT(key_length);
-    return memcached_set_error(memc, MEMCACHED_INVALID_ARGUMENTS, MEMCACHED_AT, memcached_literal_param("Invalid namespace, namespace string had value but length was 0"));
-  }
-  else if (key_length and key == NULL)
-  {
+    return memcached_set_error(
+        memc, MEMCACHED_INVALID_ARGUMENTS, MEMCACHED_AT,
+        memcached_literal_param("Invalid namespace, namespace string had value but length was 0"));
+  } else if (key_length and key == NULL) {
     WATCHPOINT_ASSERT(key);
-    return memcached_set_error(memc, MEMCACHED_INVALID_ARGUMENTS, MEMCACHED_AT, memcached_literal_param("Invalid namespace, namespace string length was > 1 but namespace string was null "));
-  }
-  else if (key and key_length)
-  {
-    bool orig= memc.flags.verify_key;
-    memc.flags.verify_key= true;
-    if (memcached_failed(memcached_key_test(memc, (const char **)&key, &key_length, 1)))
-    {
-      memc.flags.verify_key= orig;
+    return memcached_set_error(
+        memc, MEMCACHED_INVALID_ARGUMENTS, MEMCACHED_AT,
+        memcached_literal_param(
+            "Invalid namespace, namespace string length was > 1 but namespace string was null "));
+  } else if (key and key_length) {
+    bool orig = memc.flags.verify_key;
+    memc.flags.verify_key = true;
+    if (memcached_failed(memcached_key_test(memc, (const char **) &key, &key_length, 1))) {
+      memc.flags.verify_key = orig;
       return memcached_last_error(&memc);
     }
-    memc.flags.verify_key= orig;
+    memc.flags.verify_key = orig;
 
-    if ((key_length > MEMCACHED_MAX_NAMESPACE -1))
-    {
+    if ((key_length > MEMCACHED_MAX_NAMESPACE - 1)) {
       return memcached_set_error(memc, MEMCACHED_KEY_TOO_BIG, MEMCACHED_AT);
     }
 
     memcached_array_free(memc._namespace);
-    memc._namespace= memcached_strcpy(&memc, key, key_length);
+    memc._namespace = memcached_strcpy(&memc, key, key_length);
 
-    if (memc._namespace == NULL)
-    {
+    if (memc._namespace == NULL) {
       return memcached_set_error(memc, MEMCACHED_MEMORY_ALLOCATION_FAILURE, MEMCACHED_AT);
     }
-  }
-  else
-  {
+  } else {
     memcached_array_free(memc._namespace);
-    memc._namespace= NULL;
+    memc._namespace = NULL;
   }
 
   return MEMCACHED_SUCCESS;
 }
 
-const char * memcached_get_namespace(Memcached& memc)
-{
-  if (memc._namespace == NULL)
-  {
+const char *memcached_get_namespace(Memcached &memc) {
+  if (memc._namespace == NULL) {
     return NULL;
   }