X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Flibmemcached%2Fstring.hpp;h=0275f1b34d34ffc992e8d8a494798c00d204ce84;hb=48dcc61a4919f6f3d5ee164630a843f2d8b8ade9;hp=e2978ccd1ee3c03e077c7c30999ae2abf9a86714;hpb=5e760300d15ef4c5b7eed3fb9f37920ebca2f6ec;p=awesomized%2Flibmemcached

diff --git a/src/libmemcached/string.hpp b/src/libmemcached/string.hpp
index e2978ccd..0275f1b3 100644
--- a/src/libmemcached/string.hpp
+++ b/src/libmemcached/string.hpp
@@ -1,48 +1,23 @@
-/*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- * 
- *  libmcachedd client 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/ |
+    +--------------------------------------------------------------------+
+*/
 
 #pragma once
 
-#include "util/string.hpp"
-
-#define memcached_literal_param util_literal_param
-#define memcached_literal_param_size util_literal_param_size
-#define memcached_string_make_from_cstr util_string_make_from_cstr
-#define memcached_array_length util_array_length
+#define memcached_literal_param(str)          (str),strlen(str)
+#define memcached_literal_param_size(str)     strlen(str)
+#define memcached_string_make_from_cstr(str)  (str),((str)?strlen(str):0)
 
 /**
   Strings are always under our control so we make some assumptions
@@ -54,41 +29,39 @@
   3) A string always has a root.
 */
 
-memcached_string_st *memcached_string_create(memcached_st *ptr,
-                                             memcached_string_st *string,
+memcached_string_st *memcached_string_create(memcached_st *ptr, memcached_string_st *string,
                                              size_t initial_size);
 
 memcached_return_t memcached_string_check(memcached_string_st *string, size_t need);
 
 char *memcached_string_c_copy(memcached_string_st *string);
 
-memcached_return_t memcached_string_append_character(memcached_string_st *string,
-                                                     char character);
+memcached_return_t memcached_string_append_character(memcached_string_st *string, char character);
 
-memcached_return_t memcached_string_append(memcached_string_st *string,
-                                           const char *value, size_t length);
+memcached_return_t memcached_string_append(memcached_string_st *string, const char *value,
+                                           size_t length);
 
 void memcached_string_reset(memcached_string_st *string);
 
 void memcached_string_free(memcached_string_st *string);
-void memcached_string_free(memcached_string_st&);
+void memcached_string_free(memcached_string_st &);
 
 size_t memcached_string_length(const memcached_string_st *self);
-size_t memcached_string_length(const memcached_string_st&);
+size_t memcached_string_length(const memcached_string_st &);
 
 size_t memcached_string_size(const memcached_string_st *self);
 
 const char *memcached_string_value(const memcached_string_st *self);
-const char *memcached_string_value(const memcached_string_st&);
+const char *memcached_string_value(const memcached_string_st &);
 
 char *memcached_string_take_value(memcached_string_st *self);
 
 char *memcached_string_value_mutable(const memcached_string_st *self);
 
-bool memcached_string_set(memcached_string_st&, const char*, size_t);
+bool memcached_string_set(memcached_string_st &, const char *, size_t);
 
 void memcached_string_set_length(memcached_string_st *self, size_t length);
-void memcached_string_set_length(memcached_string_st&, const size_t length);
+void memcached_string_set_length(memcached_string_st &, const size_t length);
 
-bool memcached_string_resize(memcached_string_st&, const size_t);
-char *memcached_string_c_str(memcached_string_st&);
+bool memcached_string_resize(memcached_string_st &, const size_t);
+char *memcached_string_c_str(memcached_string_st &);