More timeout cleanup

diff --git a/lib/memcached_behavior.c b/lib/memcached_behavior.c
index c54d93fcd4ba03d094e591431750be2f76c867f5..31d8f0525c7fe6e8983aa19052bec8805097478d 100644 (file)
--- a/lib/memcached_behavior.c
+++ b/lib/memcached_behavior.c
@@ -51,7 +51,7 @@ memcached_return memcached_behavior_set(memcached_st *ptr,
     break;
   case MEMCACHED_BEHAVIOR_POLL_TIMEOUT:
     {
-      unsigned int timeout= (*((unsigned int *)data));
+      int32_t timeout= (*((int32_t *)data));
 
       ptr->poll_timeout= timeout;
       break;

diff --git a/src/utilities.h b/src/utilities.h
index cdec1ae6074987d8adf440a7264019f5f2a71a21..6d4d72d444419d38073ac6233bd6ce198ebec19f 100644 (file)
--- a/src/utilities.h
+++ b/src/utilities.h
@@ -1,5 +1,6 @@
 #include <memcached.h>
 #include <getopt.h>
+#include <assert.h>
 #include "client_options.h"
 #include "libmemcached_config.h"
 

diff --git a/tests/function.c b/tests/function.c
index db224f952208a64662ccfab7d3535462383bb5d1..5ba9f1f49053e361c8b385afee8daa6e125c0410 100644 (file)
--- a/tests/function.c
+++ b/tests/function.c
@@ -1523,7 +1523,7 @@ uint8_t user_supplied_bug11(memcached_st *memc)
   timeout= -1;
   memcached_behavior_set(mclone, MEMCACHED_BEHAVIOR_POLL_TIMEOUT, &timeout);
 
-  timeout= (int32_t)memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_POLL_TIMEOUT);
+  timeout= (int32_t)memcached_behavior_get(mclone, MEMCACHED_BEHAVIOR_POLL_TIMEOUT);
 
   assert(timeout == -1);