X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Flibmemcached%2Fflush_buffers.cc;h=6c58e69cd902c56f2dde262213b19415350db281;hb=2f289c64f625962d945ec3bee80f36bc5c61ee35;hp=24f7c0df69ae348afae8aad95cb2ad8638347555;hpb=5e760300d15ef4c5b7eed3fb9f37920ebca2f6ec;p=awesomized%2Flibmemcached

diff --git a/src/libmemcached/flush_buffers.cc b/src/libmemcached/flush_buffers.cc
index 24f7c0df..6c58e69c 100644
--- a/src/libmemcached/flush_buffers.cc
+++ b/src/libmemcached/flush_buffers.cc
@@ -1,65 +1,38 @@
-/*  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.
- *
- */
+/*
+    +--------------------------------------------------------------------+
+    | 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>
+#include "libmemcached/common.h"
+#include "p9y/socket.hpp"
 
-memcached_return_t memcached_flush_buffers(memcached_st *shell)
-{
-  Memcached* memc= memcached2Memcached(shell);
-  if (memc)
-  {
-    memcached_return_t ret= MEMCACHED_SUCCESS;
+memcached_return_t memcached_flush_buffers(memcached_st *shell) {
+  Memcached *memc = memcached2Memcached(shell);
+  if (memc) {
+    memcached_return_t ret = MEMCACHED_SUCCESS;
 
-    for (uint32_t x= 0; x < memcached_server_count(memc); ++x)
-    {
-      memcached_instance_st* instance= memcached_instance_fetch(memc, x);
+    for (uint32_t x = 0; x < memcached_server_count(memc); ++x) {
+      memcached_instance_st *instance = memcached_instance_fetch(memc, x);
 
-      if (instance->write_buffer_offset != 0) 
-      {
-        if (instance->fd == INVALID_SOCKET and
-            (ret= memcached_connect(instance)) != MEMCACHED_SUCCESS)
-        {
+      if (instance->write_buffer_offset) {
+        if (instance->fd == INVALID_SOCKET
+            and (ret = memcached_connect(instance)) != MEMCACHED_SUCCESS) {
           WATCHPOINT_ERROR(ret);
           return ret;
         }
 
-        if (memcached_io_write(instance) == false)
-        {
-          ret= MEMCACHED_SOME_ERRORS;
+        if (memcached_io_write(instance) == false) {
+          ret = MEMCACHED_SOME_ERRORS;
         }
       }
     }