projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge lp:~tangent-org/libmemcached/1.0-build Build: jenkins-Libmemcached-1.0-53
[awesomized/libmemcached]
/
libmemcached
/
virtual_bucket.c
diff --git
a/libmemcached/virtual_bucket.c
b/libmemcached/virtual_bucket.c
index f91bf4549f089ec887312d186cb54ab9f0d96a7a..8af3a72fdca656c5a85abf9c62877fb29d93179f 100644
(file)
--- a/
libmemcached/virtual_bucket.c
+++ b/
libmemcached/virtual_bucket.c
@@
-35,7
+35,6
@@
*
*/
*
*/
-#include <config.h>
#include <libmemcached/common.h>
struct bucket_t {
#include <libmemcached/common.h>
struct bucket_t {
@@
-65,8
+64,11
@@
memcached_return_t memcached_virtual_bucket_create(memcached_st *self,
struct memcached_virtual_bucket_t *virtual_bucket= (struct memcached_virtual_bucket_t *)malloc(sizeof(struct memcached_virtual_bucket_t) + sizeof(struct bucket_t) *buckets);
struct memcached_virtual_bucket_t *virtual_bucket= (struct memcached_virtual_bucket_t *)malloc(sizeof(struct memcached_virtual_bucket_t) + sizeof(struct bucket_t) *buckets);
- if (! virtual_bucket)
+ if (virtual_bucket == NULL)
+ {
return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
+ }
+
virtual_bucket->size= buckets;
virtual_bucket->replicas= replicas;
virtual_bucket->size= buckets;
virtual_bucket->replicas= replicas;
@@
-85,18
+87,21
@@
memcached_return_t memcached_virtual_bucket_create(memcached_st *self,
virtual_bucket->buckets[x].forward= 0;
}
}
virtual_bucket->buckets[x].forward= 0;
}
}
-
return MEMCACHED_SUCCESS;
}
void memcached_virtual_bucket_free(memcached_st *self)
{
return MEMCACHED_SUCCESS;
}
void memcached_virtual_bucket_free(memcached_st *self)
{
- if (! self)
+ if (self == NULL)
+ {
return;
return;
+ }
- if (! self->virtual_bucket)
+ if (self->virtual_bucket == NULL)
+ {
return;
return;
+ }
free(self->virtual_bucket);
self->virtual_bucket= NULL;
free(self->virtual_bucket);
self->virtual_bucket= NULL;
@@
-104,11
+109,15
@@
void memcached_virtual_bucket_free(memcached_st *self)
uint32_t memcached_virtual_bucket_get(const memcached_st *self, uint32_t digest)
{
uint32_t memcached_virtual_bucket_get(const memcached_st *self, uint32_t digest)
{
- if (! self)
+ if (self == NULL)
+ {
return 0;
return 0;
+ }
- if (! self->virtual_bucket)
+ if (self->virtual_bucket == NULL)
+ {
return 0;
return 0;
+ }
if (self->virtual_bucket)
{
if (self->virtual_bucket)
{