fix MinGW

[m6w6/libmemcached] / src / libmemcached / array.c

diff --git a/src/libmemcached/array.c b/src/libmemcached/array.c
index cd472c3923e8ccd0973f51017638579279afab60..a93b307108fd11bc2b39c5d75797bc20884f0637 100644 (file)
--- a/src/libmemcached/array.c
+++ b/src/libmemcached/array.c
@@ -1,126 +1,90 @@
-/*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- * 
- *  LibMemcached
- *
- *  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.
- *
- */
-
-#include <libmemcached/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 "libmemcached/common.h"
 #include <assert.h>
 #include <iso646.h>
 
-struct memcached_array_st
-{
+struct memcached_array_st {
   Memcached *root;
   size_t size;
   char c_str[];
 };
 
-
-memcached_array_st *memcached_array_clone(Memcached *memc, const memcached_array_st *original)
-{
-  if (original)
-  {
+memcached_array_st *memcached_array_clone(Memcached *memc, const memcached_array_st *original) {
+  if (original) {
     return memcached_strcpy(memc, original->c_str, original->size);
   }
 
   return NULL;
 }
 
-memcached_array_st *memcached_strcpy(Memcached *memc, const char *str, size_t str_length)
-{
+memcached_array_st *memcached_strcpy(Memcached *memc, const char *str, size_t str_length) {
   assert(memc);
   assert(str);
   assert(str_length);
 
-  memcached_array_st *array= (struct memcached_array_st *)libmemcached_malloc(memc, sizeof(struct memcached_array_st) +str_length +1);
+  memcached_array_st *array = (struct memcached_array_st *) libmemcached_malloc(
+      memc, sizeof(struct memcached_array_st) + str_length + 1);
 
-  if (array)
-  {
-    array->root= memc;
-    array->size= str_length; // We don't count the NULL ending
+  if (array) {
+    array->root = memc;
+    array->size = str_length; // We don't count the NULL ending
     memcpy(array->c_str, str, str_length);
-    array->c_str[str_length]= 0;
+    array->c_str[str_length] = 0;
   }
 
   return array;
 }
 
-bool memcached_array_is_null(memcached_array_st *array)
-{
-  if (array)
-  {
+bool memcached_array_is_null(memcached_array_st *array) {
+  if (array) {
     return false;
   }
 
   return true;
 }
 
-memcached_string_t memcached_array_to_string(memcached_array_st *array)
-{
+memcached_string_t memcached_array_to_string(memcached_array_st *array) {
   assert(array);
   assert(array->c_str);
   assert(array->size);
   memcached_string_t tmp;
-  tmp.c_str= array->c_str;
-  tmp.size= array->size;
+  tmp.c_str = array->c_str;
+  tmp.size = array->size;
 
   return tmp;
 }
 
-void memcached_array_free(memcached_array_st *array)
-{
-  if (array)
-  {
+void memcached_array_free(memcached_array_st *array) {
+  if (array) {
     WATCHPOINT_ASSERT(array->root);
     libmemcached_free(array->root, array);
   }
 }
 
-size_t memcached_array_size(memcached_array_st *array)
-{
-  if (array)
-  {
+size_t memcached_array_size(memcached_array_st *array) {
+  if (array) {
     return array->size;
   }
 
   return 0;
 }
 
-const char *memcached_array_string(memcached_array_st *array)
-{
-  if (array)
-  {
+const char *memcached_array_string(memcached_array_st *array) {
+  if (array) {
     return array->c_str;
   }