X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Flibmemcached%2Fmemcached.cc;h=f789cb4fe1517928cd36d3d643301c1c12ca2530;hb=3301b2f6fc5a53b428d29b788ba85fe4dae7b12d;hp=7c80e5efc7f13319f26f72f17cec76f6f0048a3d;hpb=c8a5aecba8e189092266f304ca81ab42625edf60;p=awesomized%2Flibmemcached diff --git a/src/libmemcached/memcached.cc b/src/libmemcached/memcached.cc index 7c80e5ef..f789cb4f 100644 --- a/src/libmemcached/memcached.cc +++ b/src/libmemcached/memcached.cc @@ -1,6 +1,6 @@ /* +--------------------------------------------------------------------+ - | libmemcached - C/C++ Client Library for memcached | + | 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. | @@ -9,7 +9,7 @@ | 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 | + | Copyright (c) 2020-2021 Michael Wallner https://awesome.co/ | +--------------------------------------------------------------------+ */ @@ -104,7 +104,7 @@ static inline bool _memcached_init(Memcached *self) { return true; } -static void __memcached_free(Memcached *ptr, bool release_st) { +static void memcached_free_ex(Memcached *ptr, bool release_st) { /* If we have anything open, lets close it now */ send_quit(ptr); memcached_instance_list_free(memcached_instance_list(ptr), memcached_instance_list_count(ptr)); @@ -219,7 +219,7 @@ memcached_return_t memcached_reset(memcached_st *shell) { bool stored_is_allocated = memcached_is_allocated(ptr); uint64_t query_id = ptr->query_id; - __memcached_free(ptr, false); + memcached_free_ex(ptr, false); memcached_create(ptr); memcached_set_allocated(ptr, stored_is_allocated); ptr->query_id = query_id; @@ -256,7 +256,7 @@ void memcached_reset_last_disconnected_server(memcached_st *shell) { void memcached_free(memcached_st *ptr) { if (ptr) { - __memcached_free(ptr, true); + memcached_free_ex(ptr, true); } }