add error checking, for command overflow, and short writes

[awesomized/libmemcached] / lib / memcached_connect.c

diff --git a/lib/memcached_connect.c b/lib/memcached_connect.c
index 592ede44e804e4dad5b0511f37927b0d1c3d746a..a0c8737c31df48e6e6b7b98e5549d06344408e42 100644 (file)
--- a/lib/memcached_connect.c
+++ b/lib/memcached_connect.c
@@ -10,7 +10,6 @@ memcached_return memcached_server_add(memcached_st *ptr, char *hostname, unsigne
 
 
   ptr->hosts= (memcached_host_st *)realloc(ptr->hosts, sizeof(memcached_host_st) * (ptr->number_of_hosts+1));
-  memset(ptr->hosts, 0, sizeof(memcached_host_st) * (size_t)ptr->number_of_hosts);
   ptr->hosts[ptr->number_of_hosts].hostname=
     (char *)malloc(sizeof(char) * (strlen(hostname)+1));
   memset(ptr->hosts[ptr->number_of_hosts].hostname, 0, strlen(hostname)+1);
@@ -27,7 +26,6 @@ memcached_return memcached_connect(memcached_st *ptr)
   unsigned int x;
   struct sockaddr_in localAddr, servAddr;
   struct hostent *h;
-  memcached_host_st *host_ptr;
 
   if (ptr->connected)
     return MEMCACHED_SUCCESS;
@@ -45,10 +43,7 @@ memcached_return memcached_connect(memcached_st *ptr)
   for (x= 0; x < ptr->number_of_hosts; x++)
   {
     if ((h= gethostbyname(ptr->hosts[x].hostname)) == NULL)
-    {
-      fprintf(stderr, "unknown host '%s'\n", ptr->hosts[x].hostname);
       return MEMCACHED_HOST_LOCKUP_FAILURE;
-    }
 
     servAddr.sin_family= h->h_addrtype;
     memcpy((char *) &servAddr.sin_addr.s_addr, h->h_addr_list[0], h->h_length);
@@ -56,10 +51,7 @@ memcached_return memcached_connect(memcached_st *ptr)
 
     /* Create the socket */
     if ((ptr->hosts[0].fd= socket(AF_INET, SOCK_STREAM, 0)) < 0)
-    {
-      fprintf(stderr, "cannot open socket");
       return MEMCACHED_CONNECTION_SOCKET_CREATE_FAILURE;
-    }
 
 
     /* bind any port number */
@@ -68,19 +60,11 @@ memcached_return memcached_connect(memcached_st *ptr)
     localAddr.sin_port = htons(0);
 
     if (bind(ptr->hosts[0].fd, (struct sockaddr *) &localAddr, sizeof(localAddr)) < 0)
-    {
-      fprintf(stderr, "cannot bind port TCP %u\n", ptr->hosts[x].port);
       return(MEMCACHED_CONNECTION_BIND_FAILURE);
-    }
 
     /* connect to server */
     if (connect(ptr->hosts[0].fd, (struct sockaddr *) &servAddr, sizeof(servAddr)) < 0)
-    {
-      fprintf(stderr, "cannot connect to host '%s' (%u)  (error: %s)\n", ptr->hosts[x].hostname, 
-              ptr->hosts[x].port,
-              strerror(errno));
       return MEMCACHED_HOST_LOCKUP_FAILURE;
-    }
   }
 
   ptr->connected= 1;