X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Flibmemcachedutil%2Fversion.cc;h=fab04b2e3fc6d692d02f22e2bb815deefaeea132;hb=fd0f1940d4b11f582fc237ff5ccf2c385eaa0e7d;hp=75a8f60e897bbea14ced390539dba3f02cd01147;hpb=5e760300d15ef4c5b7eed3fb9f37920ebca2f6ec;p=awesomized%2Flibmemcached

diff --git a/src/libmemcachedutil/version.cc b/src/libmemcachedutil/version.cc
index 75a8f60e..fab04b2e 100644
--- a/src/libmemcachedutil/version.cc
+++ b/src/libmemcachedutil/version.cc
@@ -1,46 +1,22 @@
-/*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- * 
- *  Libmemcached library
- *
- *  Copyright (C) 2011 Data Differential, http://datadifferential.com/
- *  Copyright (C) 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.
- *
- */
-
-
-#include <libmemcachedutil/common.h>
+/*
+    +--------------------------------------------------------------------+
+    | 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 "libmemcachedutil/common.h"
 #include <cassert>
 
-struct local_context
-{
+struct local_context {
   uint8_t major_version;
   uint8_t minor_version;
   uint8_t micro_version;
@@ -48,49 +24,39 @@ struct local_context
   bool truth;
 };
 
-static memcached_return_t check_server_version(const memcached_st *,
-                                               const memcached_instance_st * instance,
-                                               void *context)
-{
+static memcached_return_t
+check_server_version(const memcached_st *, const memcached_instance_st *instance, void *context) {
   /* Do Nothing */
-  struct local_context *check= (struct local_context *)context;
+  struct local_context *check = (struct local_context *) context;
 
   if (memcached_server_major_version(instance) != UINT8_MAX) {
     uint32_t sv, cv;
 
-    sv = memcached_server_micro_version(instance)
-        |memcached_server_minor_version(instance) << 8
-        |memcached_server_major_version(instance) << 16
-        ;
-    cv = check->micro_version
-        |check->minor_version << 8
-        |check->major_version << 16;
+    sv = memcached_server_micro_version(instance) | memcached_server_minor_version(instance) << 8
+        | memcached_server_major_version(instance) << 16;
+    cv = check->micro_version | check->minor_version << 8 | check->major_version << 16;
 
     if (sv >= cv) {
       return MEMCACHED_SUCCESS;
     }
   }
 
-  check->truth= false;
+  check->truth = false;
 
   return MEMCACHED_FAILURE;
 }
 
-bool libmemcached_util_version_check(memcached_st *memc,
-                                     uint8_t major_version,
-                                     uint8_t minor_version,
-                                     uint8_t micro_version)
-{
-  if (memcached_failed(memcached_version(memc)))
-  {
+bool libmemcached_util_version_check(memcached_st *memc, uint8_t major_version,
+                                     uint8_t minor_version, uint8_t micro_version) {
+  if (memcached_failed(memcached_version(memc))) {
     return false;
   }
 
-  struct local_context check= { major_version, minor_version, micro_version, true };
+  struct local_context check = {major_version, minor_version, micro_version, true};
 
   memcached_server_fn callbacks[1];
-  callbacks[0]= check_server_version;
-  memcached_server_cursor(memc, callbacks, (void *)&check,  1);
+  callbacks[0] = check_server_version;
+  memcached_server_cursor(memc, callbacks, (void *) &check, 1);
 
   return check.truth;
 }