X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Flibmemcached%2Finitialize_query.cc;h=ad4dfc155adb3a49a6e578fd285443c60bdfee26;hb=24f797294aca130e70317003f4ee42540429ec63;hp=34daa4e92e9cee65448e91b275af25ea89e032bb;hpb=5bb6f975322d3da0caf082b8d890132194d0a4ea;p=awesomized%2Flibmemcached

diff --git a/src/libmemcached/initialize_query.cc b/src/libmemcached/initialize_query.cc
index 34daa4e9..ad4dfc15 100644
--- a/src/libmemcached/initialize_query.cc
+++ b/src/libmemcached/initialize_query.cc
@@ -1,60 +1,34 @@
-/*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- * 
- *  Libmemcached library
- *
- *  Copyright (C) 2011 Data Differential, http://datadifferential.com/
- *
- *  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 - 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 "libmemcached/common.h"
 
-memcached_return_t initialize_query(Memcached *self, bool increment_query_id)
-{
-  if (self == NULL)
-  {
+memcached_return_t initialize_query(Memcached *self, bool increment_query_id) {
+  if (self == NULL) {
     return MEMCACHED_INVALID_ARGUMENTS;
   }
 
-  if (increment_query_id)
-  {
+  if (increment_query_id) {
     self->query_id++;
   }
 
-  if (self->state.is_time_for_rebuild)
-  {
+  if (self->state.is_time_for_rebuild) {
     memcached_reset(self);
   }
 
-  if (memcached_server_count(self) == 0)
-  {
+  if (memcached_server_count(self) == 0) {
     return memcached_set_error(*self, MEMCACHED_NO_SERVERS, MEMCACHED_AT);
   }
 
@@ -64,15 +38,12 @@ memcached_return_t initialize_query(Memcached *self, bool increment_query_id)
   return MEMCACHED_SUCCESS;
 }
 
-memcached_return_t initialize_const_query(const Memcached *self)
-{
-  if (self == NULL)
-  {
+memcached_return_t initialize_const_query(const Memcached *self) {
+  if (self == NULL) {
     return MEMCACHED_INVALID_ARGUMENTS;
   }
 
-  if (memcached_server_count(self) == 0)
-  {
+  if (memcached_server_count(self) == 0) {
     return MEMCACHED_NO_SERVERS;
   }