memcap works, though it does nothing useful at the moment :)

[awesomized/libmemcached] / lib / memcached_connect.c

diff --git a/lib/memcached_connect.c b/lib/memcached_connect.c
index 899101a2f4199ddf7342aa08e8b692eebfb9a28d..381053950b16540dbc5d05925ebcc87031d369ab 100644 (file)
--- a/lib/memcached_connect.c
+++ b/lib/memcached_connect.c
@@ -1,41 +1,4 @@
-#include <memcached.h>
-
-memcached_return memcached_server_add(memcached_st *ptr, char *hostname, unsigned int port)
-{
-  memcached_server_st *new_host_list;
-  char *new_hostname;
-
-  if (!port)
-    port= MEMCACHED_DEFAULT_PORT; 
-
-  if (!hostname)
-    hostname= "localhost"; 
-
-
-  new_host_list= (memcached_server_st *)realloc(ptr->hosts, sizeof(memcached_server_st) * (ptr->number_of_hosts+1));
-  if (!new_host_list)
-    return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
-  memset(&new_host_list[ptr->number_of_hosts], 0, sizeof(memcached_server_st));
-  
-  if (!new_host_list)
-    return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
-
-  ptr->hosts= new_host_list;
-
-  new_hostname=
-    (char *)malloc(sizeof(char) * (strlen(hostname)+1));
-  if (!new_hostname)
-    return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
-
-  memset(new_hostname, 0, strlen(hostname)+1);
-  memcpy(new_hostname, hostname, strlen(hostname));
-  ptr->hosts[ptr->number_of_hosts].hostname= new_hostname;
-  ptr->hosts[ptr->number_of_hosts].port= port;
-  ptr->hosts[ptr->number_of_hosts].fd= -1;
-  ptr->number_of_hosts++;
-
-  return MEMCACHED_SUCCESS;
-}
+#include "common.h"
 
 memcached_return memcached_connect(memcached_st *ptr)
 {
@@ -43,13 +6,13 @@ memcached_return memcached_connect(memcached_st *ptr)
   struct sockaddr_in localAddr, servAddr;
   struct hostent *h;
 
+  LIBMEMCACHED_MEMCACHED_CONNECT_START();
+
   if (ptr->connected == ptr->number_of_hosts)
     return MEMCACHED_SUCCESS;
 
   if (!ptr->hosts)
-  {
     return MEMCACHED_NO_SERVERS;
-  }
 
   for (x= 0; x < ptr->number_of_hosts; x++)
   {
@@ -82,6 +45,7 @@ memcached_return memcached_connect(memcached_st *ptr)
       ptr->connected++;
     }
   }
+  LIBMEMCACHED_MEMCACHED_CONNECT_END();
 
   return MEMCACHED_SUCCESS;
 }