X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Flibmemcached%2Finstance.cc;h=a6725d18169af5b7b5e991524f1c6327a05dcb34;hb=ac25aff8b62e8596e20f0fd2a2c3eda96bdb437e;hp=972f6b6f6ae5e3f6e3cfacd4f2b4aa3f82a023a9;hpb=2f289c64f625962d945ec3bee80f36bc5c61ee35;p=awesomized%2Flibmemcached

diff --git a/src/libmemcached/instance.cc b/src/libmemcached/instance.cc
index 972f6b6f..a6725d18 100644
--- a/src/libmemcached/instance.cc
+++ b/src/libmemcached/instance.cc
@@ -14,7 +14,6 @@
 */
 
 #include "libmemcached/common.h"
-#include "p9y/socket.hpp"
 
 static inline void _server_init(memcached_instance_st *self, Memcached *root,
                                 const memcached_string_t &hostname, in_port_t port, uint32_t weight,
@@ -98,11 +97,11 @@ void memcached_instance_st::revents(short arg) {
   _events &= short(~arg);
 }
 
-memcached_instance_st *__instance_create_with(memcached_st *memc, memcached_instance_st *self,
-                                              const memcached_string_t &hostname,
+memcached_instance_st *instance_create_with(memcached_st *memc, memcached_instance_st *self,
+                                              const memcached_string_t &_hostname,
                                               const in_port_t port, uint32_t weight,
                                               const memcached_connection_t type) {
-  if (memcached_is_valid_servername(hostname) == false) {
+  if (memcached_is_valid_servername(_hostname) == false) {
     memcached_set_error(*memc, MEMCACHED_INVALID_ARGUMENTS, MEMCACHED_AT,
                         memcached_literal_param("Invalid hostname provided"));
     return NULL;
@@ -114,7 +113,7 @@ memcached_instance_st *__instance_create_with(memcached_st *memc, memcached_inst
     return NULL;
   }
 
-  _server_init(self, const_cast<memcached_st *>(memc), hostname, port, weight, type);
+  _server_init(self, const_cast<memcached_st *>(memc), _hostname, port, weight, type);
 
   if (memc and memcached_is_udp(memc)) {
     self->write_buffer_offset = UDP_DATAGRAM_HEADER_LENGTH;
@@ -124,7 +123,7 @@ memcached_instance_st *__instance_create_with(memcached_st *memc, memcached_inst
   return self;
 }
 
-void __instance_free(memcached_instance_st *self) {
+void instance_free(memcached_instance_st *self) {
   memcached_quit_server(self, false);
 
   self->clear_addrinfo();
@@ -141,7 +140,7 @@ void __instance_free(memcached_instance_st *self) {
 
 void memcached_instance_free(memcached_instance_st *self) {
   if (self) {
-    __instance_free(self);
+    instance_free(self);
   }
 }
 
@@ -227,8 +226,8 @@ static memcached_instance_st *memcached_instance_clone(memcached_instance_st *so
   }
 
   memcached_string_t hostname_ = {memcached_string_make_from_cstr(source->hostname())};
-  return __instance_create_with(source->root, NULL, hostname_, source->port(), source->weight,
-                                source->type);
+  return instance_create_with(source->root, NULL, hostname_, source->port(), source->weight,
+                              source->type);
 }
 
 void set_last_disconnected_host(memcached_instance_st *self) {