X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Flibmemcached%2Fkey.cc;h=d6ff8a5d24c3676b9c6271b9cecfb70dffa8356e;hb=e1ba5b9e4eb179295274026ad8fd40a68eb6c67f;hp=cec0eece64400e83d3645234bca3bbc3e53e29ed;hpb=5e760300d15ef4c5b7eed3fb9f37920ebca2f6ec;p=awesomized%2Flibmemcached diff --git a/src/libmemcached/key.cc b/src/libmemcached/key.cc index cec0eece..d6ff8a5d 100644 --- a/src/libmemcached/key.cc +++ b/src/libmemcached/key.cc @@ -1,46 +1,22 @@ -/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab: - * - * Libmemcached library - * - * Copyright (C) 2011 Data Differential, http://datadifferential.com/ - * Copyright (C) 2006-2009 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 | + +--------------------------------------------------------------------+ +*/ -#include +#include "libmemcached/common.h" -static inline memcached_return_t memcached_validate_key_length(size_t key_length, bool) -{ - if (key_length == 0) - { +static inline memcached_return_t memcached_validate_key_length(size_t key_length, bool) { + if (key_length == 0) { return MEMCACHED_BAD_KEY_PROVIDED; } @@ -56,8 +32,7 @@ static inline memcached_return_t memcached_validate_key_length(size_t key_length else #endif { - if (key_length >= MEMCACHED_MAX_KEY) - { + if (key_length >= MEMCACHED_MAX_KEY) { return MEMCACHED_BAD_KEY_PROVIDED; } } @@ -65,42 +40,38 @@ static inline memcached_return_t memcached_validate_key_length(size_t key_length return MEMCACHED_SUCCESS; } -memcached_return_t memcached_key_test(memcached_st &memc, - const char * const *keys, - const size_t *key_length, - size_t number_of_keys) -{ - if (number_of_keys == 0) - { - return memcached_set_error(memc, MEMCACHED_INVALID_ARGUMENTS, MEMCACHED_AT, memcached_literal_param("Numbers of keys provided was zero")); +memcached_return_t memcached_key_test(memcached_st &memc, const char *const *keys, + const size_t *key_length, size_t number_of_keys) { + if (number_of_keys == 0) { + return memcached_set_error(memc, MEMCACHED_INVALID_ARGUMENTS, MEMCACHED_AT, + memcached_literal_param("Numbers of keys provided was zero")); } - if (keys == NULL or key_length == NULL) - { - return memcached_set_error(memc, MEMCACHED_BAD_KEY_PROVIDED, MEMCACHED_AT, memcached_literal_param("Key was NULL or length of key was zero.")); + if (keys == NULL or key_length == NULL) { + return memcached_set_error(memc, MEMCACHED_BAD_KEY_PROVIDED, MEMCACHED_AT, + memcached_literal_param("Key was NULL or length of key was zero.")); } - const bool is_binary= memcached_flag(memc, MEMCACHED_FLAG_BINARY_PROTOCOL); + const bool is_binary = memcached_flag(memc, MEMCACHED_FLAG_BINARY_PROTOCOL); // If we don't need to verify the key, or we are using the binary protoocol, // we just check the size of the key - for (size_t x= 0; x < number_of_keys; ++x) - { + for (size_t x = 0; x < number_of_keys; ++x) { // We should set binary key, but the memcached server is broken for // longer keys at the moment. - memcached_return_t rc= memcached_validate_key_length(*(key_length +x), false /* memc.flags.binary_protocol */); - if (memcached_failed(rc)) - { - return memcached_set_error(memc, rc, MEMCACHED_AT, memcached_literal_param("Key provided was too long.")); + memcached_return_t rc = + memcached_validate_key_length(*(key_length + x), false /* memc.flags.binary_protocol */); + if (memcached_failed(rc)) { + return memcached_set_error(memc, rc, MEMCACHED_AT, + memcached_literal_param("Key provided was too long.")); } - if (memc.flags.verify_key and is_binary == false) - { - for (size_t y= 0; y < *(key_length +x); ++y) - { - if ((isgraph(keys[x][y])) == 0) - { - return memcached_set_error(memc, MEMCACHED_BAD_KEY_PROVIDED, MEMCACHED_AT, memcached_literal_param("Key provided had invalid character.")); + if (memc.flags.verify_key and is_binary == false) { + for (size_t y = 0; y < *(key_length + x); ++y) { + if ((isgraph(keys[x][y])) == 0) { + return memcached_set_error( + memc, MEMCACHED_BAD_KEY_PROVIDED, MEMCACHED_AT, + memcached_literal_param("Key provided had invalid character.")); } } } @@ -108,4 +79,3 @@ memcached_return_t memcached_key_test(memcached_st &memc, return MEMCACHED_SUCCESS; } -