Update from Padraig, one additional valgrind warning I found cleaned up

[m6w6/libmemcached] / libmemcached / memcached_verbosity.c

diff --git a/libmemcached/memcached_verbosity.c b/libmemcached/memcached_verbosity.c
index 8dc9df3193c6e4f9a45ae6bccd930b7f3b32c1db..fd56316d34a7df45fc26435c63b33df32bf3fb78 100644 (file)
--- a/libmemcached/memcached_verbosity.c
+++ b/libmemcached/memcached_verbosity.c
@@ -7,8 +7,8 @@ memcached_return memcached_verbosity(memcached_st *ptr, unsigned int verbosity)
   memcached_return rc;
   char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
 
-  send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, 
-                        "verbosity %u\r\n", verbosity);
+  send_length= (size_t) snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, 
+                                 "verbosity %u\r\n", verbosity);
   unlikely (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
     return MEMCACHED_WRITE_FAILURE;
 
@@ -24,7 +24,7 @@ memcached_return memcached_verbosity(memcached_st *ptr, unsigned int verbosity)
       continue;
     }
 
-    if (ptr->flags & MEM_USE_UDP)
+    unlikely (ptr->flags & MEM_USE_UDP)
       continue;
 
     rrc= memcached_response(&ptr->hosts[x], buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL);