X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Flibmemcached%2Fserver_list.cc;h=7763a2db929d3600bca0042718fb8ba070282aeb;hb=refs%2Fheads%2Fv1.x;hp=d5c39c34282a8f101c19d540a1572a7f207d9519;hpb=c8a5aecba8e189092266f304ca81ab42625edf60;p=awesomized%2Flibmemcached

diff --git a/src/libmemcached/server_list.cc b/src/libmemcached/server_list.cc
index d5c39c34..7763a2db 100644
--- a/src/libmemcached/server_list.cc
+++ b/src/libmemcached/server_list.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   <mike@php.net>                |
+    | Copyright (c) 2020-2021 Michael Wallner        https://awesome.co/ |
     +--------------------------------------------------------------------+
 */
 
@@ -36,7 +36,7 @@ memcached_server_list_st memcached_server_list_append_with_weight(memcached_serv
 
   /* Increment count for hosts */
   uint32_t count = 1;
-  if (ptr != NULL) {
+  if (ptr) {
     count += memcached_server_list_count(ptr);
   }
 
@@ -51,8 +51,8 @@ memcached_server_list_st memcached_server_list_append_with_weight(memcached_serv
 
   memcached_string_t _hostname = {memcached_string_make_from_cstr(hostname)};
   /* @todo Check return type */
-  if (__server_create_with(NULL, &new_host_list[count - 1], _hostname, port, weight,
-                           port ? MEMCACHED_CONNECTION_TCP : MEMCACHED_CONNECTION_UNIX_SOCKET)
+  if (server_create_with(NULL, &new_host_list[count - 1], _hostname, port, weight,
+                         port ? MEMCACHED_CONNECTION_TCP : MEMCACHED_CONNECTION_UNIX_SOCKET)
       == NULL)
   {
 #if 0
@@ -63,7 +63,7 @@ memcached_server_list_st memcached_server_list_append_with_weight(memcached_serv
   }
 
 #if 0
-  // Handset allocated since 
+  // Handset allocated since
   new_host_list->options.is_allocated= true;
 #endif
 
@@ -101,7 +101,7 @@ void memcached_server_list_free(memcached_server_list_st self) {
       assert_msg(not memcached_is_allocated(&self[x]),
                  "You have called memcached_server_list_free(), but you did not pass it a valid "
                  "memcached_server_list_st");
-      __server_free(&self[x]);
+      server_free(&self[x]);
     }
 
     libmemcached_free(self->root, self);
@@ -114,7 +114,7 @@ void memcached_instance_list_free(memcached_instance_st *self, uint32_t instance
       assert_msg(memcached_is_allocated(&self[x]) == false,
                  "You have called memcached_server_list_free(), but you did not pass it a valid "
                  "memcached_server_list_st");
-      __instance_free(&self[x]);
+      instance_free(&self[x]);
     }
 
     libmemcached_free(self->root, self);