X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached_result.c;h=0d77130db58857a437089073e513afef97f00f47;hb=94cd1cbfb3fe6d0c446be9151ae9b15f775b6511;hp=8d376f680fd45ced6ef1cd6a88b4f3f21ed19666;hpb=fa7a1cc0dd5eb55a8a436a339586ffee32ed4328;p=awesomized%2Flibmemcached diff --git a/libmemcached/memcached_result.c b/libmemcached/memcached_result.c index 8d376f68..0d77130d 100644 --- 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); }