Merge lp:~yeban/libmemcached/todo-hosts.c-2 into lp:~tangent-org/libmemcached/trunk

[Anuarg Priyam]

Second attempt at addressing a marked TODO in hosts.c - check return type of memcached_server_create_with in server_add, and remove a bogus TODO marker.

[Anuarg Priyam (yeban)]

Maybe memcached_set_error is not needed, as server_add is mostly an intermediate call.

[Brian Aker (brianaker)]

Merged.

=== modified file 'libmemcached/hosts.c'
--- libmemcached/hosts.c	2011-04-07 23:12:37 +0000
+++ libmemcached/hosts.c	2011-04-11 08:47:37 +0000
@@ -341,7 +341,6 @@
     instance= memcached_server_instance_fetch(ptr, memcached_server_count(ptr));
     WATCHPOINT_ASSERT(instance);
 
-    /* TODO check return type */
     instance= memcached_server_create_with(ptr, instance, list[x].hostname,
                                            list[x].port, list[x].weight, list[x].type);
     if (! instance)
@@ -439,9 +438,14 @@
 
   memcached_server_list_set(ptr, new_host_list);
 
-  /* TODO: Check return type */
   instance= memcached_server_instance_fetch(ptr, memcached_server_count(ptr));
-  (void)memcached_server_create_with(ptr, instance, hostname, port, weight, type);
+  WATCHPOINT_ASSERT(instance);
+
+  instance= memcached_server_create_with(ptr, instance, hostname, port, weight, type);
+  if (! instance)
+  {
+      return memcached_set_error(ptr, MEMCACHED_MEMORY_ALLOCATION_FAILURE, NULL);
+  }
   ptr->number_of_hosts++;
 
   instance= memcached_server_instance_fetch(ptr, 0);