Fixed retry counter wrongly incremented in case of certain behavior change

[awesomized/libmemcached] / libmemcached / memcached_result.c

diff --git a/libmemcached/memcached_result.c b/libmemcached/memcached_result.c
index 8d376f680fd45ced6ef1cd6a88b4f3f21ed19666..0d77130db58857a437089073e513afef97f00f47 100644 (file)
--- a/libmemcached/memcached_result.c
+++ b/libmemcached/memcached_result.c
@@ -14,14 +14,10 @@ memcached_result_st *memcached_result_create(memcached_st *memc,
     memset(ptr, 0, sizeof(memcached_result_st));
   else
   {
-    if (memc->call_malloc)
-      ptr= (memcached_result_st *)memc->call_malloc(memc, sizeof(memcached_result_st));
-    else
-      ptr= (memcached_result_st *)malloc(sizeof(memcached_result_st));
+    ptr= memc->call_malloc(memc, sizeof(memcached_result_st));
 
     if (ptr == NULL)
       return NULL;
-    memset(ptr, 0, sizeof(memcached_result_st));
     ptr->is_allocated= true;
   }
 
@@ -44,7 +40,7 @@ void memcached_result_reset(memcached_result_st *ptr)
 /*
   NOTE turn into macro
 */
-memcached_return memcached_result_set_value(memcached_result_st *ptr, char *value, size_t length)
+memcached_return memcached_result_set_value(memcached_result_st *ptr, const char *value, size_t length)
 {
   return memcached_string_append(&ptr->value, value, length);
 }