Updating from Monty

diff --git a/clients/memcp.c b/clients/memcp.c
index df3ca77e315e46fa205955fcd880c11eee697af3..c748c40a6e11668f25e79dc2061fcd0c2633df9b 100644 (file)
--- a/clients/memcp.c
+++ b/clients/memcp.c
@@ -23,6 +23,10 @@
 #include <errno.h>
 #include <strings.h>
 #include <string.h>
+#include <sys/types.h>
+#include <stdlib.h>
+#include <limits.h>
+
 
 #include <libmemcached/memcached.h>
 
@@ -55,7 +59,7 @@ static long strtol_wrapper(const char *nptr, int base, bool *error)
 
   /* Check for various possible errors */
 
-  if ((errno == ERANGE && (val == INTMAX_MAX || val == INTMAX_MIN))
+  if ((errno == ERANGE && (val == LONG_MAX || val == LONG_MIN))
       || (errno != 0 && val == 0))
   {
     *error= true;

diff --git a/tests/include.am b/tests/include.am
index c29899fd4471861eaf5089839002ed680ae6a4ba..593c98fa9e6fa802fdfe3724354fcd0beee14ea5 100644 (file)
--- a/tests/include.am
+++ b/tests/include.am
@@ -4,7 +4,7 @@
 
 TESTS_LDADDS = libmemcached/libmemcached.la
 
-VALGRIND_COMMAND= $(LIBTOOL) --mode=execute valgrind --leak-check=yes --show-reachable=yes
+VALGRIND_COMMAND= $(LIBTOOL) --mode=execute valgrind --leak-check=yes --show-reachable=yes --track-fds=yes
 
 DEBUG_COMMAND= $(LIBTOOL) --mode=execute gdb
 

diff --git a/tests/mem_functions.c b/tests/mem_functions.c
index ba555111134fa4fd97b847bee43f98318419eb10..f59cf01abb7d37709d0ceaaf11c5927f7326f497 100644 (file)
--- a/tests/mem_functions.c
+++ b/tests/mem_functions.c
@@ -5028,15 +5028,12 @@ static test_return_t memcached_get_MEMCACHED_ERRNO(memcached_st *memc)
   // See if memcached is reachable.
   value= memcached_get(tl_memc_h, key, strlen(key), &len, &flags, &rc);
 
-  if (value)
-  {
-    free(value);
-    test_true(value); // Pointer won't be zero so this is fine.
-  }
-
+  test_false(value);
   test_true(len == 0);
   test_true(rc == MEMCACHED_ERRNO);
 
+  memcached_free(tl_memc_h);
+
   return TEST_SUCCESS;
 }
 
@@ -5054,12 +5051,7 @@ static test_return_t memcached_get_MEMCACHED_NOTFOUND(memcached_st *memc)
   // See if memcached is reachable.
   value= memcached_get(memc, key, strlen(key), &len, &flags, &rc);
 
-  if (value)
-  {
-    free(value);
-    test_true(value); // Pointer won't be zero so this is fine.
-  }
-
+  test_false(value);
   test_true(len == 0);
   test_true(rc == MEMCACHED_NOTFOUND);
 
@@ -5093,15 +5085,12 @@ static test_return_t memcached_get_by_key_MEMCACHED_ERRNO(memcached_st *memc)
   // See if memcached is reachable.
   value= memcached_get_by_key(tl_memc_h, key, strlen(key), key, strlen(key), &len, &flags, &rc);
 
-  if (value)
-  {
-    free(value);
-    test_true(value); // Pointer won't be zero so this is fine.
-  }
-
+  test_false(value);
   test_true(len == 0);
   test_true(rc == MEMCACHED_ERRNO);
 
+  memcached_free(tl_memc_h);
+
   return TEST_SUCCESS;
 }
 
@@ -5119,12 +5108,7 @@ static test_return_t memcached_get_by_key_MEMCACHED_NOTFOUND(memcached_st *memc)
   // See if memcached is reachable.
   value= memcached_get_by_key(memc, key, strlen(key), key, strlen(key), &len, &flags, &rc);
 
-  if (value)
-  {
-    free(value);
-    test_true(value); // Pointer won't be zero so this is fine.
-  }
-
+  test_false(value);
   test_true(len == 0);
   test_true(rc == MEMCACHED_NOTFOUND);
 

diff --git a/unittests/strings.cc b/unittests/strings.cc
index 8728926bd00ed346277794d12fe3fdfe7629f8f0..921fe8768ca17d9877920caefe215315da9961cb 100644 (file)
--- a/unittests/strings.cc
+++ b/unittests/strings.cc
@@ -8,6 +8,9 @@
 
 #include "config.h"
 
+#define __STDC_LIMIT_MACROS
+#include <stdint.h>
+
 #include <gtest/gtest.h>
 
 #include <libmemcached/common.h>