A few 32-bit fixes.

diff --git a/libmemcached/memcached_connect.c b/libmemcached/memcached_connect.c
index e9ae0c76d92c9c0bef3a4e53ab1c7ee10731da15..66525183c4a114c5800de32a027e9a0ce6b76b0d 100644 (file)
--- a/libmemcached/memcached_connect.c
+++ b/libmemcached/memcached_connect.c
@@ -218,7 +218,7 @@ static memcached_return network_connect(memcached_server_st *ptr)
 
       (void)set_socket_options(ptr);
 
-      int flags;
+      int flags= 0;
       if (ptr->root->connect_timeout)
       {
         flags= fcntl(ptr->fd, F_GETFL, 0);

diff --git a/libmemcached/memcached_storage.c b/libmemcached/memcached_storage.c
index ea8b1d249b98d5d1189d4d151bf5191120f3f5b6..97ca33cc50a7a71519452dcc8e988d2b3a55bac4 100644 (file)
--- a/libmemcached/memcached_storage.c
+++ b/libmemcached/memcached_storage.c
@@ -341,7 +341,9 @@ memcached_return memcached_cas_by_key(memcached_st *ptr,
 
 static inline uint8_t get_com_code(memcached_storage_action verb, bool noreply)
 {
-   uint8_t ret;
+  /* 0 isn't a value we want, but GCC 4.2 seems to think ret can otherwise
+   * be used uninitialized in this function. FAIL */
+  uint8_t ret= 0;
 
   if (noreply)
     switch (verb)

diff --git a/tests/function.c b/tests/function.c
index cfa5f5970c422e72f7e4e88998cab83c855eed98..cd7a82cafe10b1eb22dcce1083e14eda195ee486 100644 (file)
--- a/tests/function.c
+++ b/tests/function.c
@@ -2557,7 +2557,7 @@ static test_return  string_alloc_with_size_toobig(memcached_st *memc)
 {
   memcached_string_st *string;
 
-  string= memcached_string_create(memc, NULL, INT64_MAX);
+  string= memcached_string_create(memc, NULL, SIZE_MAX);
   assert(string == NULL);
 
   return 0;
@@ -2604,7 +2604,7 @@ static test_return  string_alloc_append_toobig(memcached_st *memc)
     rc= memcached_string_append(string, buffer, SMALL_STRING_LEN);
     assert(rc == MEMCACHED_SUCCESS);
   }
-  rc= memcached_string_append(string, buffer, INT64_MAX);
+  rc= memcached_string_append(string, buffer, SIZE_MAX);
   assert(rc == MEMCACHED_MEMORY_ALLOCATION_FAILURE);
   memcached_string_free(string);