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

[Anuarg Priyam]

check return type of memcached_server_create_with in server_add

Addresses a marked TODO in hosts.c - check return type of memcached_server_create_with in server_add

[Anuarg Priyam (yeban)]

make test, skips some (9) tests:
unix_socket
consistent_hsieh
sasl_auth
sasl
generate_hsieh
generate_hsieh_consistent
generate_corked
generate_corked_and_nonblock
lp:?

I have Debian packaged, memcached 1.4.5.

[Brian Aker (brianaker)]

Fixed in trunk

[Anuarg Priyam (yeban)]

Cool. Just remove the TODO tag from there too.

[Anuarg Priyam (yeban)]

Btw, you fixed another, similar issue in memcached_server_push rather than server_add. So, I have taken a second attempt here[1] on the lines of your changes.

[1] https://code.launchpad.net/~yeban/libmemcached/todo-hosts.c-2/+merge/57121

Unmerged revisions

932. By Anuarg Priyam on 2011-04-07

check return type of memcached_server_create_with in server_add

=== modified file 'libmemcached/hosts.c'
--- libmemcached/hosts.c	2011-04-04 20:19:33 +0000
+++ libmemcached/hosts.c	2011-04-07 07:05:52 +0000
@@ -434,9 +434,10 @@
 
   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);
+  instance= memcached_server_create_with(ptr, instance, hostname, port, weight, type);
+  if (!instance)
+      return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
   ptr->number_of_hosts++;
 
   instance= memcached_server_instance_fetch(ptr, 0);