X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached_analyze.c;h=583d828f012986cbdea937a6da75f34377c077b3;hb=4cf3ce236b4a17092ca192becbd0a2f30d0ac576;hp=6e5f54e7e10850b36b730eb83a3bc080dff9cb0d;hpb=cc5be1b75fe90e8c73871f4bd135c9e7cf1d1984;p=awesomized%2Flibmemcached

diff --git a/libmemcached/memcached_analyze.c b/libmemcached/memcached_analyze.c
index 6e5f54e7..583d828f 100644
--- a/libmemcached/memcached_analyze.c
+++ b/libmemcached/memcached_analyze.c
@@ -27,7 +27,7 @@ static void calc_least_free_node(memcached_analysis_st *result,
                                  const long max_allowed_bytes,
                                  const long used_bytes)
 {
-  long remaining_bytes= max_allowed_bytes - used_bytes;
+  uint64_t remaining_bytes= (uint64_t)max_allowed_bytes - used_bytes;
 
   if (result->least_remaining_bytes == 0 ||
       remaining_bytes < result->least_remaining_bytes)
@@ -70,7 +70,7 @@ memcached_analysis_st *memcached_analyze(memcached_st *memc,
   
   *error= MEMCACHED_SUCCESS;
   server_count= memcached_server_count(memc);
-  result= (memcached_analysis_st*)malloc(sizeof(memcached_analysis_st)
+  result= (memcached_analysis_st*)calloc(1, sizeof(memcached_analysis_st)
                                          * (memc->number_of_hosts));
   if (!result)
   {
@@ -78,8 +78,6 @@ memcached_analysis_st *memcached_analyze(memcached_st *memc,
     return NULL;
   }
 
-  memset(result, 0, sizeof(*result));
-
   for (x= 0; x < server_count; x++)
   {
     calc_largest_consumption(result, x, stat[x].bytes);