From: Brian Aker <brian@tangent.org>
Date: Wed, 9 Jan 2008 20:21:22 +0000 (-0800)
Subject: More timeout cleanup
X-Git-Tag: 0.13~4
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=da9995411e75f3a984672e926fd5bca406b13562;p=m6w6%2Flibmemcached

More timeout cleanup
---

diff --git a/lib/memcached_behavior.c b/lib/memcached_behavior.c
index c54d93fc..31d8f052 100644
--- 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 cdec1ae6..6d4d72d4 100644
--- 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 db224f95..5ba9f1f4 100644
--- 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);