Cleanup warnings/found issue in store by key functions.

diff --git a/ChangeLog b/ChangeLog
index 80b2cdc238304002cc613959140fea18d11e5bf8..b870bd68983879d1e06905e2b141fc7c1a760b63 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+  * Cleanup compile warnings.
+  * Fix issues in partitioning by keys.
+
 0.23 Sun Sep  7 08:13:59 PDT 2008
   * Added strings.h header for Solaris 9
   * Solaris 64bit fix.

diff --git a/clients/utilities.c b/clients/utilities.c
index b5755ee12139dab629e23a342ef786b8b94049f0..1e8e89d70a0a50671fdd87dfa16ab96e2328516a 100644 (file)
--- a/clients/utilities.c
+++ b/clients/utilities.c
@@ -21,7 +21,7 @@ void version_command(char *command_name)
   exit(0);
 }
 
-char *lookup_help(memcached_options option)
+static char *lookup_help(memcached_options option)
 {
   switch (option)
   {
@@ -43,6 +43,7 @@ char *lookup_help(memcached_options option)
   case OPT_SLAP_TCP_NODELAY: return("Set TCP socket up to use nodelay.");
   case OPT_FLUSH: return("Flush servers before running tests.");
   case OPT_HASH: return("Select hash type.");
+  case OPT_BINARY: return("Switch to binary protocol.");
   };
 
   WATCHPOINT_ASSERT(0);
@@ -51,7 +52,7 @@ char *lookup_help(memcached_options option)
 
 void help_command(char *command_name, char *description,
                   const struct option *long_options,
-                  memcached_programs_help_st *options)
+                  memcached_programs_help_st *options __attribute__((unused)))
 {
   unsigned int x;
 

diff --git a/configure.ac b/configure.ac
index 53a377fe2f248aa087102c029ac724a2c5798913..33968234713e0a46ff656bacf425461ac2cc1cbc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -59,7 +59,7 @@ sinclude(config/protocol_binary.m4)
 CFLAGS="-DMEMCACHED_INTERNAL $CFLAGS"
 if test "$GCC" = "yes"
 then
-  CFLAGS="-W -Wall -Wextra -Wstrict-aliasing -pedantic -Wundef -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -O3 $CFLAGS"
+  CFLAGS="-W -std=iso9899:1999 -Wall -Wextra -Wstrict-aliasing -pedantic -Wundef -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -O3 $CFLAGS"
 
   if test "$ENABLE_DEBUG" = "yes"
   then

diff --git a/libmemcached/memcached_auto.c b/libmemcached/memcached_auto.c
index 81e594e9e0e0239196cdd77eec3ed664ee2d7585..b0bd05b0df29617507049cd517590a48cca45f71 100644 (file)
--- a/libmemcached/memcached_auto.c
+++ b/libmemcached/memcached_auto.c
@@ -74,7 +74,7 @@ static memcached_return binary_incr_decr(memcached_st *ptr, uint8_t cmd,
   unlikely (ptr->hosts == NULL || ptr->number_of_hosts == 0)
     return MEMCACHED_NO_SERVERS;
 
-  if ((ptr->flags & MEM_VERIFY_KEY) && (memcachd_key_test(&key, &key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED))
+  if ((ptr->flags & MEM_VERIFY_KEY) && (memcachd_key_test((char **)&key, &key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED))
     return MEMCACHED_BAD_KEY_PROVIDED;
 
   server_key= memcached_generate_hash(ptr, key, key_length);

diff --git a/libmemcached/memcached_behavior.c b/libmemcached/memcached_behavior.c
index 97ad378157a921a3f4ed2d5df0a462e5b9282062..ef4907dd24e02502cd96b69b534421cf3c2e7729 100644 (file)
--- a/libmemcached/memcached_behavior.c
+++ b/libmemcached/memcached_behavior.c
@@ -9,7 +9,7 @@
   We quit all connections so we can reset the sockets.
 */
 
-void set_behavior_flag(memcached_st *ptr, memcached_flags temp_flag, uint64_t data)
+static void set_behavior_flag(memcached_st *ptr, memcached_flags temp_flag, uint64_t data)
 {
   if (data)
     ptr->flags|= temp_flag;
@@ -169,16 +169,20 @@ uint64_t memcached_behavior_get(memcached_st *ptr,
     break;
   case MEMCACHED_BEHAVIOR_POLL_TIMEOUT:
     {
-      return (unsigned long long)ptr->poll_timeout;
+      return (uint64_t)ptr->poll_timeout;
     }
   case MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT:
     {
-      return (unsigned long long)ptr->connect_timeout;
+      return (uint64_t)ptr->connect_timeout;
     }
   case MEMCACHED_BEHAVIOR_RETRY_TIMEOUT:
     {
-      return (unsigned long long)ptr->retry_timeout;
+      return (uint64_t)ptr->retry_timeout;
     }
+  case MEMCACHED_BEHAVIOR_SND_TIMEOUT:
+    return (uint64_t)ptr->snd_timeout;
+  case MEMCACHED_BEHAVIOR_RCV_TIMEOUT:
+    return (uint64_t)ptr->rcv_timeout;
   case MEMCACHED_BEHAVIOR_SOCKET_SEND_SIZE:
     {
       int sock_size;

diff --git a/libmemcached/memcached_connect.c b/libmemcached/memcached_connect.c
index de69e4465ef8c68e34d608f4bace32d4d0cd5042..54316c59f90e677eae6752a7bedc45b318adfca0 100644 (file)
--- a/libmemcached/memcached_connect.c
+++ b/libmemcached/memcached_connect.c
@@ -13,7 +13,7 @@ static memcached_return set_hostinfo(memcached_server_st *server)
 
   memset(&hints, 0, sizeof(hints));
 
-  hints.ai_family= AF_INET;
+ // hints.ai_family= AF_INET;
   if (server->type == MEMCACHED_CONNECTION_UDP)
   {
     hints.ai_protocol= IPPROTO_UDP;

diff --git a/libmemcached/memcached_delete.c b/libmemcached/memcached_delete.c
index 3e1390fa56d71fe6e78874a79af664c6710a4106..c1c1267c9b8653ca0eae7700b529a416e320ac7e 100644 (file)
--- a/libmemcached/memcached_delete.c
+++ b/libmemcached/memcached_delete.c
@@ -41,10 +41,10 @@ memcached_return memcached_delete_by_key(memcached_st *ptr,
   {
     if (expiration)
       send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, 
-                            "delete %s%.*s %llu\r\n", 
+                            "delete %s%.*s %u\r\n", 
                             ptr->prefix_key,
                             (int)key_length, key, 
-                            (unsigned long long)expiration);
+                            (uint32_t)expiration);
     else
        send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, 
                              "delete %s%.*s\r\n", 

diff --git a/libmemcached/memcached_get.c b/libmemcached/memcached_get.c
index a01beee62e954f57235466c05bf9ce885207595f..dd02cf29c7151362fd87f3ea47a40fd3d7b11b2f 100644 (file)
--- a/libmemcached/memcached_get.c
+++ b/libmemcached/memcached_get.c
@@ -250,7 +250,7 @@ static memcached_return binary_mget_by_key(memcached_st *ptr,
                                            unsigned int number_of_keys)
 {
   memcached_return rc= MEMCACHED_NOTFOUND;
-  int x;
+  uint32_t x;
 
   int flush= number_of_keys == 1;
 

diff --git a/libmemcached/memcached_hash.c b/libmemcached/memcached_hash.c
index b8c8cfe5529923f1f0c5546a4c0ba04db5434e9d..fb8bd63dd8c253a848abd589667d4da5eab2db89 100644 (file)
--- a/libmemcached/memcached_hash.c
+++ b/libmemcached/memcached_hash.c
@@ -103,7 +103,7 @@ uint32_t generate_hash(memcached_st *ptr, const char *key, size_t key_length)
   return hash;
 }
 
-unsigned int dispatch_host(memcached_st *ptr, uint32_t hash)
+static uint32_t dispatch_host(memcached_st *ptr, uint32_t hash)
 {
   switch (ptr->distribution) 
   {
@@ -169,7 +169,7 @@ uint32_t memcached_generate_hash(memcached_st *ptr, const char *key, size_t key_
   if (ptr->number_of_hosts == 1)
     return 0;
 
-  hash = generate_hash(ptr, key, key_length);
+  hash= generate_hash(ptr, key, key_length);
 
   WATCHPOINT_ASSERT(hash);
 

diff --git a/libmemcached/memcached_io.h b/libmemcached/memcached_io.h
index 091405b1b549068f16bce6e50da801ee6506af70..3f991be79013a0945f85acda854206a1e52af3cd 100644 (file)
--- a/libmemcached/memcached_io.h
+++ b/libmemcached/memcached_io.h
@@ -1,9 +1,14 @@
 /* Server IO, Not public! */
 #include <memcached.h>
 
+#ifndef __MEMCACHED_IO_H__
+#define __MEMCACHED_IO_H__
+
 ssize_t memcached_io_write(memcached_server_st *ptr,
                            const void *buffer, size_t length, char with_flush);
 void memcached_io_reset(memcached_server_st *ptr);
 ssize_t memcached_io_read(memcached_server_st *ptr,
                           void *buffer, size_t length);
 memcached_return memcached_io_close(memcached_server_st *ptr, uint8_t io_death);
+
+#endif __MEMCACHED_IO_H__

diff --git a/libmemcached/memcached_response.c b/libmemcached/memcached_response.c
index f81f51548dbe58be3788513188be5cfc2ecb080b..c8b2896593a207f3b1eb35fde5adba6900412c2d 100644 (file)
--- a/libmemcached/memcached_response.c
+++ b/libmemcached/memcached_response.c
@@ -168,7 +168,7 @@ memcached_return memcached_response(memcached_server_st *ptr,
     memcached_io_reset(ptr);
     return MEMCACHED_CLIENT_ERROR;
   default:
-    if(sscanf(buffer, "%lld", &auto_return_value) == 1) 
+    if (sscanf(buffer, "%lld", &auto_return_value) == 1) 
         return MEMCACHED_SUCCESS;
     memcached_io_reset(ptr);
     return MEMCACHED_UNKNOWN_READ_FAILURE;

diff --git a/libmemcached/memcached_stats.c b/libmemcached/memcached_stats.c
index 1b5576e7f072a2bbe3e8f54ef7a80a7a51ba2b43..96f0eb1cfb7ebe28261b1d785c0fdf8f90c973bf 100644 (file)
--- a/libmemcached/memcached_stats.c
+++ b/libmemcached/memcached_stats.c
@@ -394,7 +394,7 @@ memcached_return memcached_stat_servername(memcached_stat_st *stat, char *args,
   We make a copy of the keys since at some point in the not so distant future
   we will add support for "found" keys.
 */
-char ** memcached_stat_get_keys(memcached_st *ptr, memcached_stat_st *stat, 
+char ** memcached_stat_get_keys(memcached_st *ptr, memcached_stat_st *stat __attribute__((unused)), 
                                 memcached_return *error)
 {
   char **list;

diff --git a/libmemcached/memcached_storage.c b/libmemcached/memcached_storage.c
index d42124d7a13b47905edd8a885ca23a379353d243..7284e13636e485f00d0d79093545187e2b0a1349 100644 (file)
--- a/libmemcached/memcached_storage.c
+++ b/libmemcached/memcached_storage.c
@@ -229,7 +229,8 @@ memcached_return memcached_cas(memcached_st *ptr,
 }
 
 memcached_return memcached_set_by_key(memcached_st *ptr, 
-                                      const char *master_key, size_t master_key_length, 
+                                      const char *master_key __attribute__((unused)), 
+                                      size_t master_key_length __attribute__((unused)), 
                                       const char *key, size_t key_length, 
                                       const char *value, size_t value_length, 
                                       time_t expiration,
@@ -237,7 +238,7 @@ memcached_return memcached_set_by_key(memcached_st *ptr,
 {
   memcached_return rc;
   LIBMEMCACHED_MEMCACHED_SET_START();
-  rc= memcached_send(ptr, key, key_length, 
+  rc= memcached_send(ptr, master_key, master_key_length, 
                      key, key_length, value, value_length,
                      expiration, flags, 0, SET_OP);
   LIBMEMCACHED_MEMCACHED_SET_END();
@@ -253,7 +254,7 @@ memcached_return memcached_add_by_key(memcached_st *ptr,
 {
   memcached_return rc;
   LIBMEMCACHED_MEMCACHED_ADD_START();
-  rc= memcached_send(ptr, key, key_length, 
+  rc= memcached_send(ptr, master_key, master_key_length, 
                      key, key_length, value, value_length,
                      expiration, flags, 0, ADD_OP);
   LIBMEMCACHED_MEMCACHED_ADD_END();
@@ -269,7 +270,7 @@ memcached_return memcached_replace_by_key(memcached_st *ptr,
 {
   memcached_return rc;
   LIBMEMCACHED_MEMCACHED_REPLACE_START();
-  rc= memcached_send(ptr, key, key_length, 
+  rc= memcached_send(ptr, master_key, master_key_length, 
                      key, key_length, value, value_length,
                      expiration, flags, 0, REPLACE_OP);
   LIBMEMCACHED_MEMCACHED_REPLACE_END();
@@ -284,7 +285,7 @@ memcached_return memcached_prepend_by_key(memcached_st *ptr,
                                           uint32_t flags)
 {
   memcached_return rc;
-  rc= memcached_send(ptr, key, key_length, 
+  rc= memcached_send(ptr, master_key, master_key_length, 
                      key, key_length, value, value_length,
                      expiration, flags, 0, PREPEND_OP);
   return rc;
@@ -298,7 +299,7 @@ memcached_return memcached_append_by_key(memcached_st *ptr,
                                          uint32_t flags)
 {
   memcached_return rc;
-  rc= memcached_send(ptr, key, key_length, 
+  rc= memcached_send(ptr, master_key, master_key_length, 
                      key, key_length, value, value_length,
                      expiration, flags, 0, APPEND_OP);
   return rc;

diff --git a/libmemcached/memcached_strerror.c b/libmemcached/memcached_strerror.c
index 3271682d2fdfeed1b902e674d5306a674248c826..7b0e8d34021c0582370bdd8fa0f443e3b94ba15c 100644 (file)
--- a/libmemcached/memcached_strerror.c
+++ b/libmemcached/memcached_strerror.c
@@ -1,6 +1,6 @@
 #include "common.h"
 
-char *memcached_strerror(memcached_st *ptr, memcached_return rc)
+char *memcached_strerror(memcached_st *ptr __attribute__((unused)), memcached_return rc)
 {
   switch (rc)
   {

diff --git a/libmemcached/memcached_string.c b/libmemcached/memcached_string.c
index 1595ec6108b9f00b69ea3293de0cabeeb847e32f..3cc894d52c9ff55426cf3d5a368fd2175b59232b 100644 (file)
--- a/libmemcached/memcached_string.c
+++ b/libmemcached/memcached_string.c
@@ -88,7 +88,7 @@ memcached_return memcached_string_append_character(memcached_string_st *string,
   if (rc != MEMCACHED_SUCCESS)
     return rc;
 
-  *string->end= ' ';
+  *string->end= character;
   string->end++;
 
   return MEMCACHED_SUCCESS;
@@ -116,24 +116,6 @@ memcached_return memcached_string_append(memcached_string_st *string,
   return MEMCACHED_SUCCESS;
 }
 
-size_t memcached_string_backspace(memcached_string_st *string, size_t remove)
-{
-  WATCHPOINT_ASSERT(string->is_allocated != MEMCACHED_USED);
-
-  if (string->end - string->string  > remove)
-  {
-    size_t difference;
-
-    difference= string->end - string->string;
-    string->end= string->string;
-
-    return difference;
-  }
-  string->end-= remove;
-
-  return remove;
-}
-
 char *memcached_string_c_copy(memcached_string_st *string)
 {
   char *c_ptr;

diff --git a/libmemcached/memcached_string.h b/libmemcached/memcached_string.h
index 44e52cad54a3cc5dede44a7bbc83d0c405ea3fb3..403602edaef3a402e86753a6459a6e5c63b6fac6 100644 (file)
--- a/libmemcached/memcached_string.h
+++ b/libmemcached/memcached_string.h
@@ -36,7 +36,6 @@ memcached_return memcached_string_append_character(memcached_string_st *string,
                                                    char character);
 memcached_return memcached_string_append(memcached_string_st *string,
                                          char *value, size_t length);
-size_t memcached_string_backspace(memcached_string_st *string, size_t remove);
 memcached_return memcached_string_reset(memcached_string_st *string);
 void memcached_string_free(memcached_string_st *string);
 

diff --git a/tests/function.c b/tests/function.c
index dfb47b4e26cc7279211bd5eeabd49d7e6cdc656c..b03b06da2912a2f69ffbf9c63a9ea26c8b64209d 100644 (file)
--- a/tests/function.c
+++ b/tests/function.c
@@ -33,7 +33,7 @@ static pairs_st *global_pairs;
 static char *global_keys[GLOBAL_COUNT];
 static size_t global_keys_length[GLOBAL_COUNT];
 
-test_return init_test(memcached_st *not_used)
+static test_return  init_test(memcached_st *not_used __attribute__((unused)))
 {
   memcached_st memc;
 
@@ -43,7 +43,7 @@ test_return init_test(memcached_st *not_used)
   return 0;
 }
 
-test_return server_list_null_test(memcached_st *ptr)
+static test_return  server_list_null_test(memcached_st *ptr __attribute__((unused)))
 {
   memcached_server_st *server_list;
   memcached_return rc;
@@ -63,7 +63,7 @@ test_return server_list_null_test(memcached_st *ptr)
 #define TEST_PORT_COUNT 7
 uint32_t test_ports[TEST_PORT_COUNT];
 
-memcached_return server_display_function(memcached_st *ptr, memcached_server_st *server, void *context)
+static memcached_return  server_display_function(memcached_st *ptr __attribute__((unused)), memcached_server_st *server, void *context)
 {
   /* Do Nothing */
   uint32_t bigger= *((uint32_t *)(context));
@@ -73,9 +73,9 @@ memcached_return server_display_function(memcached_st *ptr, memcached_server_st
   return MEMCACHED_SUCCESS;
 }
 
-test_return server_sort_test(memcached_st *ptr)
+static test_return  server_sort_test(memcached_st *ptr __attribute__((unused)))
 {
-  uint8_t x;
+  uint32_t x;
   uint32_t bigger= 0; /* Prime the value for the assert in server_display_function */
   memcached_return rc;
   memcached_server_function callbacks[1];
@@ -89,7 +89,7 @@ test_return server_sort_test(memcached_st *ptr)
   {
     test_ports[x]= random() % 64000;
     rc= memcached_server_add(local_memc, "localhost", test_ports[x]);
-    assert(local_memc->number_of_hosts == x+1);
+    assert(local_memc->number_of_hosts == x + 1);
     assert(local_memc->hosts[0].count == x+1);
     assert(rc == MEMCACHED_SUCCESS);
   }
@@ -103,7 +103,7 @@ test_return server_sort_test(memcached_st *ptr)
   return 0;
 }
 
-test_return server_sort2_test(memcached_st *ptr)
+static test_return  server_sort2_test(memcached_st *ptr __attribute__((unused)))
 {
   uint32_t bigger= 0; /* Prime the value for the assert in server_display_function */
   memcached_return rc;
@@ -133,7 +133,7 @@ test_return server_sort2_test(memcached_st *ptr)
   return 0;
 }
 
-memcached_return server_display_unsort_function(memcached_st *ptr, memcached_server_st *server, void *context)
+static memcached_return  server_display_unsort_function(memcached_st *ptr __attribute__((unused)), memcached_server_st *server, void *context)
 {
   /* Do Nothing */
   uint32_t x= *((uint32_t *)(context));
@@ -144,9 +144,9 @@ memcached_return server_display_unsort_function(memcached_st *ptr, memcached_ser
   return MEMCACHED_SUCCESS;
 }
 
-test_return server_unsort_test(memcached_st *ptr)
+static test_return  server_unsort_test(memcached_st *ptr __attribute__((unused)))
 {
-  uint8_t x;
+  uint32_t x;
   uint32_t counter= 0; /* Prime the value for the assert in server_display_function */
   uint32_t bigger= 0; /* Prime the value for the assert in server_display_function */
   memcached_return rc;
@@ -179,7 +179,7 @@ test_return server_unsort_test(memcached_st *ptr)
   return 0;
 }
 
-test_return allocation_test(memcached_st *not_used)
+static test_return  allocation_test(memcached_st *not_used __attribute__((unused)))
 {
   memcached_st *memc;
   memc= memcached_create(NULL);
@@ -189,7 +189,7 @@ test_return allocation_test(memcached_st *not_used)
   return 0;
 }
 
-test_return clone_test(memcached_st *memc)
+static test_return  clone_test(memcached_st *memc)
 {
   /* All null? */
   {
@@ -228,7 +228,7 @@ test_return clone_test(memcached_st *memc)
   return 0;
 }
 
-test_return connection_test(memcached_st *memc)
+static test_return  connection_test(memcached_st *memc)
 {
   memcached_return rc;
 
@@ -238,7 +238,7 @@ test_return connection_test(memcached_st *memc)
   return 0;
 }
 
-test_return error_test(memcached_st *memc)
+static test_return  error_test(memcached_st *memc)
 {
   memcached_return rc;
 
@@ -250,7 +250,7 @@ test_return error_test(memcached_st *memc)
   return 0;
 }
 
-test_return set_test(memcached_st *memc)
+static test_return  set_test(memcached_st *memc)
 {
   memcached_return rc;
   char *key= "foo";
@@ -264,7 +264,7 @@ test_return set_test(memcached_st *memc)
   return 0;
 }
 
-test_return append_test(memcached_st *memc)
+static test_return  append_test(memcached_st *memc)
 {
   memcached_return rc;
   char *key= "fig";
@@ -300,7 +300,7 @@ test_return append_test(memcached_st *memc)
   return 0;
 }
 
-test_return append_binary_test(memcached_st *memc)
+static test_return  append_binary_test(memcached_st *memc)
 {
   memcached_return rc;
   char *key= "numbers";
@@ -346,7 +346,7 @@ test_return append_binary_test(memcached_st *memc)
   return 0;
 }
 
-test_return cas2_test(memcached_st *memc)
+static test_return  cas2_test(memcached_st *memc)
 {
   memcached_return rc;
   char *keys[]= {"fudge", "son", "food"};
@@ -390,7 +390,7 @@ test_return cas2_test(memcached_st *memc)
   return 0;
 }
 
-test_return cas_test(memcached_st *memc)
+static test_return  cas_test(memcached_st *memc)
 {
   memcached_return rc;
   char *key= "fun";
@@ -442,7 +442,7 @@ test_return cas_test(memcached_st *memc)
   return 0;
 }
 
-test_return prepend_test(memcached_st *memc)
+static test_return  prepend_test(memcached_st *memc)
 {
   memcached_return rc;
   char *key= "fig";
@@ -482,7 +482,7 @@ test_return prepend_test(memcached_st *memc)
   Set the value, then quit to make sure it is flushed.
   Come back in and test that add fails.
 */
-test_return add_test(memcached_st *memc)
+static test_return  add_test(memcached_st *memc)
 {
   memcached_return rc;
   char *key= "foo";
@@ -509,7 +509,7 @@ test_return add_test(memcached_st *memc)
   return 0;
 }
 
-test_return add_wrapper(memcached_st *memc)
+static test_return  add_wrapper(memcached_st *memc)
 {
   unsigned int x;
 
@@ -519,7 +519,7 @@ test_return add_wrapper(memcached_st *memc)
   return 0;
 }
 
-test_return replace_test(memcached_st *memc)
+static test_return  replace_test(memcached_st *memc)
 {
   memcached_return rc;
   char *key= "foo";
@@ -539,7 +539,7 @@ test_return replace_test(memcached_st *memc)
   return 0;
 }
 
-test_return delete_test(memcached_st *memc)
+static test_return  delete_test(memcached_st *memc)
 {
   memcached_return rc;
   char *key= "foo";
@@ -556,7 +556,7 @@ test_return delete_test(memcached_st *memc)
   return 0;
 }
 
-test_return flush_test(memcached_st *memc)
+static test_return  flush_test(memcached_st *memc)
 {
   memcached_return rc;
 
@@ -566,14 +566,16 @@ test_return flush_test(memcached_st *memc)
   return 0;
 }
 
-memcached_return server_function(memcached_st *ptr, memcached_server_st *server, void *context)
+static memcached_return  server_function(memcached_st *ptr __attribute__((unused)), 
+                                         memcached_server_st *server __attribute__((unused)), 
+                                         void *context __attribute__((unused)))
 {
   /* Do Nothing */
 
   return MEMCACHED_SUCCESS;
 }
 
-test_return memcached_server_cursor_test(memcached_st *memc)
+static test_return  memcached_server_cursor_test(memcached_st *memc)
 {
   char *context= "foo bad";
   memcached_server_function callbacks[1];
@@ -584,7 +586,7 @@ test_return memcached_server_cursor_test(memcached_st *memc)
   return 0;
 }
 
-test_return bad_key_test(memcached_st *memc)
+static test_return  bad_key_test(memcached_st *memc)
 {
   memcached_return rc;
   char *key= "foo bad";
@@ -646,15 +648,16 @@ test_return bad_key_test(memcached_st *memc)
 }
 
 #define READ_THROUGH_VALUE "set for me"
-memcached_return read_through_trigger(memcached_st *memc,  
-                                      char *key, size_t key_length, 
+static memcached_return  read_through_trigger(memcached_st *memc __attribute__((unused)),
+                                      char *key __attribute__((unused)), 
+                                      size_t key_length __attribute__((unused)), 
                                       memcached_result_st *result)
 {
   
   return memcached_result_set_value(result, READ_THROUGH_VALUE, strlen(READ_THROUGH_VALUE));
 }
 
-test_return read_through(memcached_st *memc)
+static test_return  read_through(memcached_st *memc)
 {
   memcached_return rc;
   char *key= "foo";
@@ -669,7 +672,7 @@ test_return read_through(memcached_st *memc)
   assert(string_length ==  0);
   assert(!string);
 
-  rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_GET_FAILURE, read_through_trigger);
+  rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_GET_FAILURE, (void *)read_through_trigger);
   assert(rc == MEMCACHED_SUCCESS);
 
   string= memcached_get(memc, key, strlen(key),
@@ -691,14 +694,16 @@ test_return read_through(memcached_st *memc)
   return 0;
 }
 
-memcached_return delete_trigger(memcached_st *ptr,  const char *key, size_t key_length)
+static memcached_return  delete_trigger(memcached_st *ptr __attribute__((unused)),  
+                                        const char *key, 
+                                        size_t key_length __attribute__((unused)))
 {
   assert(key);
 
   return MEMCACHED_SUCCESS;
 }
 
-test_return delete_through(memcached_st *memc)
+static test_return  delete_through(memcached_st *memc)
 {
   memcached_trigger_delete_key callback;
   memcached_return rc;
@@ -711,7 +716,7 @@ test_return delete_through(memcached_st *memc)
   return 0;
 }
 
-test_return get_test(memcached_st *memc)
+static test_return  get_test(memcached_st *memc)
 {
   memcached_return rc;
   char *key= "foo";
@@ -732,7 +737,7 @@ test_return get_test(memcached_st *memc)
   return 0;
 }
 
-test_return get_test2(memcached_st *memc)
+static test_return  get_test2(memcached_st *memc)
 {
   memcached_return rc;
   char *key= "foo";
@@ -759,7 +764,7 @@ test_return get_test2(memcached_st *memc)
   return 0;
 }
 
-test_return set_test2(memcached_st *memc)
+static test_return  set_test2(memcached_st *memc)
 {
   memcached_return rc;
   char *key= "foo";
@@ -778,7 +783,7 @@ test_return set_test2(memcached_st *memc)
   return 0;
 }
 
-test_return set_test3(memcached_st *memc)
+static test_return  set_test3(memcached_st *memc)
 {
   memcached_return rc;
   char *key= "foo";
@@ -805,7 +810,7 @@ test_return set_test3(memcached_st *memc)
   return 0;
 }
 
-test_return get_test3(memcached_st *memc)
+static test_return  get_test3(memcached_st *memc)
 {
   memcached_return rc;
   char *key= "foo";
@@ -814,7 +819,7 @@ test_return get_test3(memcached_st *memc)
   char *string;
   size_t string_length;
   uint32_t flags;
-  int x;
+  uint32_t x;
 
   value = (char*)malloc(value_length);
   assert(value);
@@ -841,7 +846,7 @@ test_return get_test3(memcached_st *memc)
   return 0;
 }
 
-test_return get_test4(memcached_st *memc)
+static test_return  get_test4(memcached_st *memc)
 {
   memcached_return rc;
   char *key= "foo";
@@ -850,7 +855,7 @@ test_return get_test4(memcached_st *memc)
   char *string;
   size_t string_length;
   uint32_t flags;
-  int x;
+  uint32_t x;
 
   value = (char*)malloc(value_length);
   assert(value);
@@ -881,7 +886,7 @@ test_return get_test4(memcached_st *memc)
 }
 
 /* Do not copy the style of this code, I just access hosts to testthis function */
-test_return stats_servername_test(memcached_st *memc)
+static test_return  stats_servername_test(memcached_st *memc)
 {
   memcached_return rc;
   memcached_stat_st stat;
@@ -892,7 +897,7 @@ test_return stats_servername_test(memcached_st *memc)
   return 0;
 }
 
-test_return increment_test(memcached_st *memc)
+static test_return  increment_test(memcached_st *memc)
 {
   uint64_t new_number;
   memcached_return rc;
@@ -917,7 +922,7 @@ test_return increment_test(memcached_st *memc)
   return 0;
 }
 
-test_return decrement_test(memcached_st *memc)
+static test_return  decrement_test(memcached_st *memc)
 {
   uint64_t new_number;
   memcached_return rc;
@@ -942,7 +947,7 @@ test_return decrement_test(memcached_st *memc)
   return 0;
 }
 
-test_return quit_test(memcached_st *memc)
+static test_return  quit_test(memcached_st *memc)
 {
   memcached_return rc;
   char *key= "fudge";
@@ -962,7 +967,7 @@ test_return quit_test(memcached_st *memc)
   return 0;
 }
 
-test_return mget_result_test(memcached_st *memc)
+static test_return  mget_result_test(memcached_st *memc)
 {
   memcached_return rc;
   char *keys[]= {"fudge", "son", "food"};
@@ -1019,7 +1024,7 @@ test_return mget_result_test(memcached_st *memc)
   return 0;
 }
 
-test_return mget_result_alloc_test(memcached_st *memc)
+static test_return  mget_result_alloc_test(memcached_st *memc)
 {
   memcached_return rc;
   char *keys[]= {"fudge", "son", "food"};
@@ -1070,16 +1075,18 @@ test_return mget_result_alloc_test(memcached_st *memc)
 }
 
 /* Count the results */
-unsigned int callback_counter(memcached_st *ptr, memcached_result_st *result, void *context)
+static memcached_return callback_counter(memcached_st *ptr __attribute__((unused)), 
+                                     memcached_result_st *result __attribute__((unused)), 
+                                     void *context)
 {
   unsigned int *counter= (unsigned int *)context;
 
   *counter= *counter + 1;
 
-  return 0;
+  return MEMCACHED_SUCCESS;
 }
 
-test_return mget_result_function(memcached_st *memc)
+static test_return  mget_result_function(memcached_st *memc)
 {
   memcached_return rc;
   char *keys[]= {"fudge", "son", "food"};
@@ -1110,7 +1117,7 @@ test_return mget_result_function(memcached_st *memc)
   return 0;
 }
 
-test_return mget_test(memcached_st *memc)
+static test_return  mget_test(memcached_st *memc)
 {
   memcached_return rc;
   char *keys[]= {"fudge", "son", "food"};
@@ -1165,7 +1172,7 @@ test_return mget_test(memcached_st *memc)
   return 0;
 }
 
-test_return get_stats_keys(memcached_st *memc)
+static test_return  get_stats_keys(memcached_st *memc)
 {
  char **list;
  char **ptr;
@@ -1183,7 +1190,7 @@ test_return get_stats_keys(memcached_st *memc)
  return 0;
 }
 
-test_return version_string_test(memcached_st *memc)
+static test_return  version_string_test(memcached_st *memc __attribute__((unused)))
 {
   const char *version_string;
 
@@ -1194,7 +1201,7 @@ test_return version_string_test(memcached_st *memc)
   return 0;
 }
 
-test_return get_stats(memcached_st *memc)
+static test_return  get_stats(memcached_st *memc)
 {
  unsigned int x;
  char **list;
@@ -1222,7 +1229,7 @@ test_return get_stats(memcached_st *memc)
   return 0;
 }
 
-test_return add_host_test(memcached_st *memc)
+static test_return  add_host_test(memcached_st *memc)
 {
   unsigned int x;
   memcached_server_st *servers;
@@ -1254,17 +1261,17 @@ test_return add_host_test(memcached_st *memc)
   return 0;
 }
 
-memcached_return clone_test_callback(memcached_st *parent, memcached_st *clone)
+static memcached_return  clone_test_callback(memcached_st *parent __attribute__((unused)), memcached_st *clone __attribute__((unused)))
 {
   return MEMCACHED_SUCCESS;
 }
 
-memcached_return cleanup_test_callback(memcached_st *ptr)
+static memcached_return  cleanup_test_callback(memcached_st *ptr __attribute__((unused)))
 {
   return MEMCACHED_SUCCESS;
 }
 
-test_return callback_test(memcached_st *memc)
+static test_return  callback_test(memcached_st *memc)
 {
   /* Test User Data */
   {
@@ -1304,7 +1311,7 @@ test_return callback_test(memcached_st *memc)
 }
 
 /* We don't test the behavior itself, we test the switches */
-test_return behavior_test(memcached_st *memc)
+static test_return  behavior_test(memcached_st *memc)
 {
   uint64_t value;
   uint32_t set= 1;
@@ -1352,13 +1359,13 @@ test_return behavior_test(memcached_st *memc)
 }
 
 /* Test case provided by Cal Haldenbrand */
-test_return user_supplied_bug1(memcached_st *memc)
+static test_return  user_supplied_bug1(memcached_st *memc)
 {
   unsigned int setter= 1;
   unsigned int x;
 
   unsigned long long total= 0;
-  int size= 0;
+  uint32_t size= 0;
   char key[10];
   char randomstuff[6 * 1024]; 
   memcached_return rc;
@@ -1399,7 +1406,7 @@ test_return user_supplied_bug1(memcached_st *memc)
 }
 
 /* Test case provided by Cal Haldenbrand */
-test_return user_supplied_bug2(memcached_st *memc)
+static test_return  user_supplied_bug2(memcached_st *memc)
 {
   int errors;
   unsigned int setter;
@@ -1455,7 +1462,7 @@ test_return user_supplied_bug2(memcached_st *memc)
 
 /* Do a large mget() over all the keys we think exist */
 #define KEY_COUNT 3000 // * 1024576
-test_return user_supplied_bug3(memcached_st *memc)
+static test_return  user_supplied_bug3(memcached_st *memc)
 {
   memcached_return rc;
   unsigned int setter;
@@ -1515,7 +1522,7 @@ test_return user_supplied_bug3(memcached_st *memc)
 }
 
 /* Make sure we behave properly if server list has no values */
-test_return user_supplied_bug4(memcached_st *memc)
+static test_return  user_supplied_bug4(memcached_st *memc)
 {
   memcached_return rc;
   char *keys[]= {"fudge", "son", "food"};
@@ -1578,7 +1585,7 @@ test_return user_supplied_bug4(memcached_st *memc)
 }
 
 #define VALUE_SIZE_BUG5 1048064
-test_return user_supplied_bug5(memcached_st *memc)
+static test_return  user_supplied_bug5(memcached_st *memc)
 {
   memcached_return rc;
   char *keys[]= {"036790384900", "036790384902", "036790384904", "036790384906"};
@@ -1636,7 +1643,7 @@ test_return user_supplied_bug5(memcached_st *memc)
   return 0;
 }
 
-test_return user_supplied_bug6(memcached_st *memc)
+static test_return  user_supplied_bug6(memcached_st *memc)
 {
   memcached_return rc;
   char *keys[]= {"036790384900", "036790384902", "036790384904", "036790384906"};
@@ -1701,7 +1708,7 @@ test_return user_supplied_bug6(memcached_st *memc)
   return 0;
 }
 
-test_return user_supplied_bug8(memcached_st *memc)
+static test_return  user_supplied_bug8(memcached_st *memc __attribute__((unused)))
 {
   memcached_return rc;
   memcached_st *mine;
@@ -1732,7 +1739,7 @@ test_return user_supplied_bug8(memcached_st *memc)
 }
 
 /* Test flag store/retrieve */
-test_return user_supplied_bug7(memcached_st *memc)
+static test_return  user_supplied_bug7(memcached_st *memc)
 {
   memcached_return rc;
   char *keys= "036790384900";
@@ -1776,7 +1783,7 @@ test_return user_supplied_bug7(memcached_st *memc)
   return 0;
 }
 
-test_return user_supplied_bug9(memcached_st *memc)
+static test_return  user_supplied_bug9(memcached_st *memc)
 {
   memcached_return rc;
   char *keys[]= {"UDATA:edevil@sapo.pt", "fudge&*@#", "for^#@&$not"};
@@ -1821,7 +1828,7 @@ test_return user_supplied_bug9(memcached_st *memc)
 }
 
 /* We are testing with aggressive timeout to get failures */
-test_return user_supplied_bug10(memcached_st *memc)
+static test_return  user_supplied_bug10(memcached_st *memc)
 {
   char *key= "foo";
   char *value;
@@ -1862,7 +1869,7 @@ test_return user_supplied_bug10(memcached_st *memc)
 /*
   We are looking failures in the async protocol
 */
-test_return user_supplied_bug11(memcached_st *memc)
+static test_return  user_supplied_bug11(memcached_st *memc)
 {
   char *key= "foo";
   char *value;
@@ -1902,7 +1909,7 @@ test_return user_supplied_bug11(memcached_st *memc)
 /*
   Bug found where incr was not returning MEMCACHED_NOTFOUND when object did not exist.
 */
-test_return user_supplied_bug12(memcached_st *memc)
+static test_return  user_supplied_bug12(memcached_st *memc)
 {
   memcached_return rc;
   uint32_t flags;
@@ -1941,7 +1948,7 @@ test_return user_supplied_bug12(memcached_st *memc)
   Bug found where command total one more than MEMCACHED_MAX_BUFFER
   set key34567890 0 0 8169 \r\n is sent followed by buffer of size 8169, followed by 8169
  */
-test_return user_supplied_bug13(memcached_st *memc)
+static test_return  user_supplied_bug13(memcached_st *memc)
 {
   char key[] = "key34567890";
   char *overflow;
@@ -1979,7 +1986,7 @@ test_return user_supplied_bug13(memcached_st *memc)
   set key34567890 0 0 8169 \r\n
   is sent followed by buffer of size 8169, followed by 8169
  */
-test_return user_supplied_bug14(memcached_st *memc)
+static test_return  user_supplied_bug14(memcached_st *memc)
 {
   int setter= 1;
   memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_TCP_NODELAY, setter);
@@ -2024,7 +2031,7 @@ test_return user_supplied_bug14(memcached_st *memc)
 /*
   Look for zero length value problems
   */
-test_return user_supplied_bug15(memcached_st *memc)
+static test_return  user_supplied_bug15(memcached_st *memc)
 {
   uint32_t x;
   memcached_return rc;
@@ -2062,7 +2069,7 @@ test_return user_supplied_bug15(memcached_st *memc)
 }
 
 /* Check the return sizes on FLAGS to make sure it stores 32bit unsigned values correctly */
-test_return user_supplied_bug16(memcached_st *memc)
+static test_return  user_supplied_bug16(memcached_st *memc)
 {
   memcached_return rc;
   char *key= "mykey";
@@ -2088,7 +2095,7 @@ test_return user_supplied_bug16(memcached_st *memc)
 }
 
 /* Check the validity of chinese key*/
-test_return user_supplied_bug17(memcached_st *memc)
+static test_return  user_supplied_bug17(memcached_st *memc)
 {
     memcached_return rc;
     char *key= "豆瓣";
@@ -2115,7 +2122,7 @@ test_return user_supplied_bug17(memcached_st *memc)
 }
 
 
-test_return result_static(memcached_st *memc)
+static test_return  result_static(memcached_st *memc)
 {
   memcached_result_st result;
   memcached_result_st *result_ptr;
@@ -2128,7 +2135,7 @@ test_return result_static(memcached_st *memc)
   return 0;
 }
 
-test_return result_alloc(memcached_st *memc)
+static test_return  result_alloc(memcached_st *memc)
 {
   memcached_result_st *result;
 
@@ -2139,7 +2146,7 @@ test_return result_alloc(memcached_st *memc)
   return 0;
 }
 
-test_return string_static_null(memcached_st *memc)
+static test_return  string_static_null(memcached_st *memc)
 {
   memcached_string_st string;
   memcached_string_st *string_ptr;
@@ -2152,7 +2159,7 @@ test_return string_static_null(memcached_st *memc)
   return 0;
 }
 
-test_return string_alloc_null(memcached_st *memc)
+static test_return  string_alloc_null(memcached_st *memc)
 {
   memcached_string_st *string;
 
@@ -2163,7 +2170,7 @@ test_return string_alloc_null(memcached_st *memc)
   return 0;
 }
 
-test_return string_alloc_with_size(memcached_st *memc)
+static test_return  string_alloc_with_size(memcached_st *memc)
 {
   memcached_string_st *string;
 
@@ -2174,7 +2181,7 @@ test_return string_alloc_with_size(memcached_st *memc)
   return 0;
 }
 
-test_return string_alloc_with_size_toobig(memcached_st *memc)
+static test_return  string_alloc_with_size_toobig(memcached_st *memc)
 {
   memcached_string_st *string;
 
@@ -2184,7 +2191,7 @@ test_return string_alloc_with_size_toobig(memcached_st *memc)
   return 0;
 }
 
-test_return string_alloc_append(memcached_st *memc)
+static test_return  string_alloc_append(memcached_st *memc)
 {
   unsigned int x;
   char buffer[SMALL_STRING_LEN];
@@ -2207,7 +2214,7 @@ test_return string_alloc_append(memcached_st *memc)
   return 0;
 }
 
-test_return string_alloc_append_toobig(memcached_st *memc)
+static test_return  string_alloc_append_toobig(memcached_st *memc)
 {
   memcached_return rc;
   unsigned int x;
@@ -2232,14 +2239,14 @@ test_return string_alloc_append_toobig(memcached_st *memc)
   return 0;
 }
 
-test_return cleanup_pairs(memcached_st *memc)
+static test_return  cleanup_pairs(memcached_st *memc __attribute__((unused)))
 {
   pairs_free(global_pairs);
 
   return 0;
 }
 
-test_return generate_pairs(memcached_st *memc)
+static test_return  generate_pairs(memcached_st *memc __attribute__((unused)))
 {
   unsigned long long x;
   global_pairs= pairs_generate(GLOBAL_COUNT, 400);
@@ -2254,7 +2261,7 @@ test_return generate_pairs(memcached_st *memc)
   return 0;
 }
 
-test_return generate_large_pairs(memcached_st *memc)
+static test_return  generate_large_pairs(memcached_st *memc __attribute__((unused)))
 {
   unsigned long long x;
   global_pairs= pairs_generate(GLOBAL2_COUNT, MEMCACHED_MAX_BUFFER+10);
@@ -2269,14 +2276,14 @@ test_return generate_large_pairs(memcached_st *memc)
   return 0;
 }
 
-test_return generate_data(memcached_st *memc)
+static test_return  generate_data(memcached_st *memc)
 {
   execute_set(memc, global_pairs, global_count);
 
   return 0;
 }
 
-test_return generate_data_with_stats(memcached_st *memc)
+static test_return  generate_data_with_stats(memcached_st *memc)
 {
   memcached_stat_st *stat_p;
   memcached_return rc;
@@ -2294,10 +2301,9 @@ test_return generate_data_with_stats(memcached_st *memc)
 
   memcached_stat_free(NULL, stat_p);
 
-
   return 0;
 }
-test_return generate_buffer_data(memcached_st *memc)
+static test_return  generate_buffer_data(memcached_st *memc)
 {
   int latch= 0;
 
@@ -2308,7 +2314,7 @@ test_return generate_buffer_data(memcached_st *memc)
   return 0;
 }
 
-test_return get_read_count(memcached_st *memc)
+static test_return  get_read_count(memcached_st *memc)
 {
   unsigned int x;
   memcached_return rc;
@@ -2344,7 +2350,7 @@ test_return get_read_count(memcached_st *memc)
   return 0;
 }
 
-test_return get_read(memcached_st *memc)
+static test_return  get_read(memcached_st *memc)
 {
   unsigned int x;
   memcached_return rc;
@@ -2370,7 +2376,7 @@ test_return get_read(memcached_st *memc)
   return 0;
 }
 
-test_return mget_read(memcached_st *memc)
+static test_return  mget_read(memcached_st *memc)
 {
   memcached_return rc;
 
@@ -2396,7 +2402,7 @@ test_return mget_read(memcached_st *memc)
   return 0;
 }
 
-test_return mget_read_result(memcached_st *memc)
+static test_return  mget_read_result(memcached_st *memc)
 {
   memcached_return rc;
 
@@ -2421,7 +2427,7 @@ test_return mget_read_result(memcached_st *memc)
   return 0;
 }
 
-test_return mget_read_function(memcached_st *memc)
+static test_return  mget_read_function(memcached_st *memc)
 {
   memcached_return rc;
   unsigned int counter;
@@ -2437,7 +2443,7 @@ test_return mget_read_function(memcached_st *memc)
   return 0;
 }
 
-test_return delete_generate(memcached_st *memc)
+static test_return  delete_generate(memcached_st *memc)
 {
   unsigned int x;
 
@@ -2449,7 +2455,7 @@ test_return delete_generate(memcached_st *memc)
   return 0;
 }
 
-test_return delete_buffer_generate(memcached_st *memc)
+static test_return  delete_buffer_generate(memcached_st *memc)
 {
   int latch= 0;
   unsigned int x;
@@ -2465,14 +2471,14 @@ test_return delete_buffer_generate(memcached_st *memc)
   return 0;
 }
 
-test_return free_data(memcached_st *memc)
+static test_return  free_data(memcached_st *memc __attribute__((unused)))
 {
   pairs_free(global_pairs);
 
   return 0;
 }
 
-test_return add_host_test1(memcached_st *memc)
+static test_return  add_host_test1(memcached_st *memc)
 {
   unsigned int x;
   memcached_return rc;
@@ -2504,70 +2510,70 @@ test_return add_host_test1(memcached_st *memc)
   return 0;
 }
 
-memcached_return pre_nonblock(memcached_st *memc)
+static memcached_return  pre_nonblock(memcached_st *memc)
 {
   memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NO_BLOCK, 0);
 
   return MEMCACHED_SUCCESS;
 }
 
-memcached_return pre_murmur(memcached_st *memc)
+static memcached_return  pre_murmur(memcached_st *memc)
 {
   memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, (uint64_t)MEMCACHED_HASH_MURMUR);
 
   return MEMCACHED_SUCCESS;
 }
 
-memcached_return pre_md5(memcached_st *memc)
+static memcached_return  pre_md5(memcached_st *memc)
 {
   memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, (uint64_t)MEMCACHED_HASH_MD5);
 
   return MEMCACHED_SUCCESS;
 }
 
-memcached_return pre_crc(memcached_st *memc)
+static memcached_return  pre_crc(memcached_st *memc)
 {
   memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, (uint64_t)MEMCACHED_HASH_CRC);
 
   return MEMCACHED_SUCCESS;
 }
 
-memcached_return pre_hsieh(memcached_st *memc)
+static memcached_return  pre_hsieh(memcached_st *memc)
 {
   memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, (uint64_t)MEMCACHED_HASH_HSIEH);
 
   return MEMCACHED_SUCCESS;
 }
 
-memcached_return pre_hash_fnv1_64(memcached_st *memc)
+static memcached_return  pre_hash_fnv1_64(memcached_st *memc)
 {
   memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, (uint64_t)MEMCACHED_HASH_FNV1_64);
 
   return MEMCACHED_SUCCESS;
 }
 
-memcached_return pre_hash_fnv1a_64(memcached_st *memc)
+static memcached_return  pre_hash_fnv1a_64(memcached_st *memc)
 {
   memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, (uint64_t)MEMCACHED_HASH_FNV1A_64);
 
   return MEMCACHED_SUCCESS;
 }
 
-memcached_return pre_hash_fnv1_32(memcached_st *memc)
+static memcached_return  pre_hash_fnv1_32(memcached_st *memc)
 {
   memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, (uint64_t)MEMCACHED_HASH_FNV1_32);
 
   return MEMCACHED_SUCCESS;
 }
 
-memcached_return pre_hash_fnv1a_32(memcached_st *memc)
+static memcached_return  pre_hash_fnv1a_32(memcached_st *memc)
 {
   memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, (uint64_t)MEMCACHED_HASH_FNV1A_32);
 
   return MEMCACHED_SUCCESS;
 }
 
-memcached_return pre_behavior_ketama(memcached_st *memc)
+static memcached_return  pre_behavior_ketama(memcached_st *memc)
 {
   memcached_return rc;
   uint64_t value;
@@ -2581,7 +2587,7 @@ memcached_return pre_behavior_ketama(memcached_st *memc)
   return MEMCACHED_SUCCESS;
 }
 
-memcached_return pre_behavior_ketama_weighted(memcached_st *memc)
+static memcached_return  pre_behavior_ketama_weighted(memcached_st *memc)
 {
   memcached_return rc;
   uint64_t value;
@@ -2600,7 +2606,7 @@ memcached_return pre_behavior_ketama_weighted(memcached_st *memc)
   return MEMCACHED_SUCCESS;
 }
 
-memcached_return pre_binary(memcached_st *memc)
+static memcached_return  pre_binary(memcached_st *memc)
 {
   memcached_return rc= MEMCACHED_FAILURE;
   memcached_st *clone;
@@ -2622,22 +2628,22 @@ memcached_return pre_binary(memcached_st *memc)
   return rc;
 }
 
-void my_free(memcached_st *ptr, void *mem)
+static void my_free(memcached_st *ptr __attribute__((unused)), void *mem)
 {
   free(mem);
 }
 
-void *my_malloc(memcached_st *ptr, const size_t size)
+static void *my_malloc(memcached_st *ptr __attribute__((unused)), const size_t size)
 {
   return malloc(size);
 }
 
-void *my_realloc(memcached_st *ptr, void *mem, const size_t size)
+static void *my_realloc(memcached_st *ptr __attribute__((unused)), void *mem, const size_t size)
 {
   return realloc(mem, size);
 }
 
-memcached_return set_prefix(memcached_st *memc)
+static memcached_return  set_prefix(memcached_st *memc)
 {
   memcached_return rc;
   const char *key= "mine";
@@ -2702,7 +2708,7 @@ memcached_return set_prefix(memcached_st *memc)
   return MEMCACHED_SUCCESS;
 }
 
-memcached_return set_memory_alloc(memcached_st *memc)
+static memcached_return  set_memory_alloc(memcached_st *memc)
 {
   {
     memcached_malloc_function test_ptr;
@@ -2740,7 +2746,7 @@ memcached_return set_memory_alloc(memcached_st *memc)
   return MEMCACHED_SUCCESS;
 }
 
-memcached_return enable_consistent(memcached_st *memc)
+static memcached_return  enable_consistent(memcached_st *memc)
 {
   memcached_server_distribution value= MEMCACHED_DISTRIBUTION_CONSISTENT;
   memcached_hash hash;
@@ -2757,7 +2763,7 @@ memcached_return enable_consistent(memcached_st *memc)
   return MEMCACHED_SUCCESS;
 }
 
-memcached_return enable_cas(memcached_st *memc)
+static memcached_return  enable_cas(memcached_st *memc)
 {
   unsigned int set= 1;
 
@@ -2774,7 +2780,7 @@ memcached_return enable_cas(memcached_st *memc)
   return MEMCACHED_FAILURE;
 }
 
-memcached_return check_for_1_2_3(memcached_st *memc)
+static memcached_return  check_for_1_2_3(memcached_st *memc)
 {
   memcached_version(memc);
 
@@ -2785,7 +2791,7 @@ memcached_return check_for_1_2_3(memcached_st *memc)
   return MEMCACHED_FAILURE;
 }
 
-memcached_return pre_unix_socket(memcached_st *memc)
+static memcached_return  pre_unix_socket(memcached_st *memc)
 {
   memcached_return rc;
   struct stat buf;
@@ -2802,23 +2808,7 @@ memcached_return pre_unix_socket(memcached_st *memc)
   return rc;
 }
 
-memcached_return pre_udp(memcached_st *memc)
-{
-  memcached_return rc;
-
-  memcached_server_list_free(memc->hosts);
-  memc->hosts= NULL;
-  memc->number_of_hosts= 0;
-
-  if (0)
-    return MEMCACHED_FAILURE;
-
-  rc= memcached_server_add_udp(memc, "localhost", MEMCACHED_DEFAULT_PORT);
-
-  return rc;
-}
-
-memcached_return pre_nodelay(memcached_st *memc)
+static memcached_return  pre_nodelay(memcached_st *memc)
 {
   memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NO_BLOCK, 0);
   memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_TCP_NODELAY, 0);
@@ -2826,7 +2816,7 @@ memcached_return pre_nodelay(memcached_st *memc)
   return MEMCACHED_SUCCESS;
 }
 
-memcached_return pre_settimer(memcached_st *memc)
+static memcached_return  pre_settimer(memcached_st *memc)
 {
   memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_SND_TIMEOUT, 1000);
   memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_RCV_TIMEOUT, 1000);
@@ -2834,7 +2824,7 @@ memcached_return pre_settimer(memcached_st *memc)
   return MEMCACHED_SUCCESS;
 }
 
-memcached_return poll_timeout(memcached_st *memc)
+static memcached_return  poll_timeout(memcached_st *memc)
 {
   int32_t timeout;
 
@@ -2881,6 +2871,7 @@ test_st tests[] ={
   {"mget_result_function", 1, mget_result_function },
   {"get_stats", 0, get_stats },
   {"add_host_test", 0, add_host_test },
+  {"add_host_test_1", 0, add_host_test1 },
   {"get_stats_keys", 0, get_stats_keys },
   {"behavior_test", 0, get_stats_keys },
   {"callback_test", 0, get_stats_keys },
@@ -2999,7 +2990,6 @@ collection_st collection[] ={
   {"consistent", enable_consistent, 0, tests},
   {"memory_allocators", set_memory_alloc, 0, tests},
   {"prefix", set_prefix, 0, tests},
-//  {"udp", pre_udp, 0, tests},
   {"version_1_2_3", check_for_1_2_3, 0, version_1_2_3},
   {"string", 0, 0, string_tests},
   {"result", 0, 0, result_tests},
@@ -3020,6 +3010,10 @@ collection_st collection[] ={
 
 #define SERVERS_TO_CREATE 5
 
+/* Prototypes for functions we will pass to test framework */
+void *world_create(void);
+void world_destroy(void *p);
+
 void *world_create(void)
 {
   server_startup_st *construct;
@@ -3033,6 +3027,7 @@ void *world_create(void)
   return construct;
 }
 
+
 void world_destroy(void *p)
 {
   server_startup_st *construct= (server_startup_st *)p;