projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge of configure
[awesomized/libmemcached]
/
libmemcached
/
memcached_analyze.c
diff --git
a/libmemcached/memcached_analyze.c
b/libmemcached/memcached_analyze.c
index 6e5f54e7e10850b36b730eb83a3bc080dff9cb0d..583d828f012986cbdea937a6da75f34377c077b3 100644
(file)
--- 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)
{
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)
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);
*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)
{
* (memc->number_of_hosts));
if (!result)
{
@@
-78,8
+78,6
@@
memcached_analysis_st *memcached_analyze(memcached_st *memc,
return NULL;
}
return NULL;
}
- memset(result, 0, sizeof(*result));
-
for (x= 0; x < server_count; x++)
{
calc_largest_consumption(result, x, stat[x].bytes);
for (x= 0; x < server_count; x++)
{
calc_largest_consumption(result, x, stat[x].bytes);