Merge Stewart

diff --git a/example/memcached_light.c b/example/memcached_light.c
index c4495b5946802eca82b3e4ae11ada8573d9bf9ac..d9e14727a6e664be4910b8d9721a7d29fd09c84d 100644 (file)
--- a/example/memcached_light.c
+++ b/example/memcached_light.c
@@ -311,7 +311,6 @@ static void work(void)
     fds[max_poll].events= POLLIN;
     fds[max_poll].revents= 0;
     fds[max_poll].fd= server_sockets[max_poll];
-    ++max_poll;
   }
 
   while (true)

diff --git a/libmemcached/hosts.c b/libmemcached/hosts.c
index e3e9e9c67783caec32fefa8adf6bff46d730ac4d..1cbc80305f4e0f2ba7011d4be2adbf62fb9b1de9 100644 (file)
--- a/libmemcached/hosts.c
+++ b/libmemcached/hosts.c
@@ -299,7 +299,7 @@ memcached_return_t memcached_server_push(memcached_st *ptr, memcached_server_st
 {
   uint32_t x;
   uint32_t count;
-  memcached_server_instance_st *new_host_list;
+  memcached_server_st *new_host_list;
 
   if (! list)
     return MEMCACHED_SUCCESS;

diff --git a/libmemcached/parse.c b/libmemcached/parse.c
index 73cc9dfec7d79ef461f71c6a61621bb408c783fe..6675b1a3c2a54bfe44ec74d3769ddd0e40dce6c7 100644 (file)
--- a/libmemcached/parse.c
+++ b/libmemcached/parse.c
@@ -10,7 +10,7 @@
 memcached_server_st *memcached_servers_parse(const char *server_strings)
 {
   char *string;
-  uint32_t port;
+  in_port_t port;
   uint32_t weight;
   const char *begin_ptr;
   const char *end_ptr;
@@ -52,7 +52,7 @@ memcached_server_st *memcached_servers_parse(const char *server_strings)
 
       ptr++;
 
-      port= (uint32_t) strtoul(ptr, (char **)NULL, 10);
+      port= (in_port_t) strtoul(ptr, (char **)NULL, 10);
 
       ptr2= index(ptr, ' ');
       if (! ptr2)

diff --git a/tests/mem_functions.c b/tests/mem_functions.c
index 749659f3a81e72cbe93e5bdc3a30208d675cbcdf..9ac8ee51c4b17559664aa719d43fb0bbaeaa2185 100644 (file)
--- a/tests/mem_functions.c
+++ b/tests/mem_functions.c
@@ -80,7 +80,7 @@ static test_return_t  server_list_null_test(memcached_st *ptr __attribute__((unu
 }
 
 #define TEST_PORT_COUNT 7
-uint32_t test_ports[TEST_PORT_COUNT];
+in_port_t test_ports[TEST_PORT_COUNT];
 
 static memcached_return_t  server_display_function(memcached_st *ptr __attribute__((unused)), memcached_server_st *server, void *context)
 {
@@ -106,7 +106,7 @@ static test_return_t  server_sort_test(memcached_st *ptr __attribute__((unused))
 
   for (x= 0; x < TEST_PORT_COUNT; x++)
   {
-    test_ports[x]= (uint32_t)random() % 64000;
+    test_ports[x]= (in_port_t)random() % 64000;
     rc= memcached_server_add_with_weight(local_memc, "localhost", test_ports[x], 0);
     test_truth(memcached_server_count(local_memc) == x + 1);
     test_truth(memcached_servers_count(memcached_server_list(local_memc)) == x+1);
@@ -183,7 +183,7 @@ static test_return_t  server_unsort_test(memcached_st *ptr __attribute__((unused
 
   for (x= 0; x < TEST_PORT_COUNT; x++)
   {
-    test_ports[x]= (uint32_t)(random() % 64000);
+    test_ports[x]= (in_port_t)(random() % 64000);
     rc= memcached_server_add_with_weight(local_memc, "localhost", test_ports[x], 0);
     test_truth(memcached_server_count(local_memc) == x+1);
     test_truth(memcached_servers_count(memcached_server_list(local_memc)) == x+1);