X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached_result.c;h=8d376f680fd45ced6ef1cd6a88b4f3f21ed19666;hb=93b444da927e8e0ee3fd844ea617d96a04fbaa97;hp=0860e792e528f6ae3de02b725e03a8ce27454fa2;hpb=3b706525e1b66b907905bb9eddd7fd824e8311de;p=awesomized%2Flibmemcached diff --git a/libmemcached/memcached_result.c b/libmemcached/memcached_result.c index 0860e792..8d376f68 100644 --- a/libmemcached/memcached_result.c +++ b/libmemcached/memcached_result.c @@ -11,10 +11,7 @@ memcached_result_st *memcached_result_create(memcached_st *memc, { /* Saving malloc calls :) */ if (ptr) - { memset(ptr, 0, sizeof(memcached_result_st)); - ptr->is_allocated= MEMCACHED_NOT_ALLOCATED; - } else { if (memc->call_malloc) @@ -25,13 +22,12 @@ memcached_result_st *memcached_result_create(memcached_st *memc, if (ptr == NULL) return NULL; memset(ptr, 0, sizeof(memcached_result_st)); - ptr->is_allocated= MEMCACHED_ALLOCATED; + ptr->is_allocated= true; } ptr->root= memc; memcached_string_create(memc, &ptr->value, 0); WATCHPOINT_ASSERT(ptr->value.string == NULL); - WATCHPOINT_ASSERT(ptr->value.is_allocated == MEMCACHED_NOT_ALLOCATED); return ptr; } @@ -60,8 +56,6 @@ void memcached_result_free(memcached_result_st *ptr) memcached_string_free(&ptr->value); - if (ptr->is_allocated == MEMCACHED_ALLOCATED) + if (ptr->is_allocated) free(ptr); - else - ptr->is_allocated= MEMCACHED_USED; }