projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Fixing spec file for release.
[awesomized/libmemcached]
/
libmemcached
/
storage.c
diff --git
a/libmemcached/storage.c
b/libmemcached/storage.c
index 6b4eb623f7eb005cca70e6f80a64f152029c075a..6225af3732b15934db4d94df5e8b02be3dd95f63 100644
(file)
--- a/
libmemcached/storage.c
+++ b/
libmemcached/storage.c
@@
-65,12
+65,12
@@
static inline memcached_return_t memcached_send(memcached_st *ptr,
uint64_t cas,
memcached_storage_action_t verb)
{
uint64_t cas,
memcached_storage_action_t verb)
{
-
char
to_write;
+
bool
to_write;
size_t write_length;
memcached_return_t rc;
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
uint32_t server_key;
size_t write_length;
memcached_return_t rc;
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
uint32_t server_key;
- memcached_server_
instance_st *
instance;
+ memcached_server_
write_instance_st
instance;
WATCHPOINT_ASSERT(!(value == NULL && value_length > 0));
WATCHPOINT_ASSERT(!(value == NULL && value_length > 0));
@@
-92,7
+92,7
@@
static inline memcached_return_t memcached_send(memcached_st *ptr,
flags, cas, verb);
}
flags, cas, verb);
}
- server_key= memcached_generate_hash(ptr, master_key, master_key_length);
+ server_key= memcached_generate_hash
_with_redistribution
(ptr, master_key, master_key_length);
instance= memcached_server_instance_fetch(ptr, server_key);
if (cas)
instance= memcached_server_instance_fetch(ptr, server_key);
if (cas)
@@
-149,7
+149,7
@@
static inline memcached_return_t memcached_send(memcached_st *ptr,
}
/* Send command header */
}
/* Send command header */
- rc= memcached_do(instance, buffer, write_length,
0
);
+ rc= memcached_do(instance, buffer, write_length,
false
);
if (rc != MEMCACHED_SUCCESS)
goto error;
if (rc != MEMCACHED_SUCCESS)
goto error;
@@
-162,11
+162,11
@@
static inline memcached_return_t memcached_send(memcached_st *ptr,
if (ptr->flags.buffer_requests && verb == SET_OP)
{
if (ptr->flags.buffer_requests && verb == SET_OP)
{
- to_write=
0
;
+ to_write=
false
;
}
else
{
}
else
{
- to_write=
1
;
+ to_write=
true
;
}
if (memcached_io_write(instance, "\r\n", 2, to_write) == -1)
}
if (memcached_io_write(instance, "\r\n", 2, to_write) == -1)
@@
-176,9
+176,9
@@
static inline memcached_return_t memcached_send(memcached_st *ptr,
}
if (ptr->flags.no_reply)
}
if (ptr->flags.no_reply)
- return (to_write ==
0
) ? MEMCACHED_BUFFERED : MEMCACHED_SUCCESS;
+ return (to_write ==
false
) ? MEMCACHED_BUFFERED : MEMCACHED_SUCCESS;
- if (to_write ==
0
)
+ if (to_write ==
false
)
return MEMCACHED_BUFFERED;
rc= memcached_response(instance, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL);
return MEMCACHED_BUFFERED;
rc= memcached_response(instance, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL);
@@
-441,13
+441,13
@@
static memcached_return_t memcached_send_binary(memcached_st *ptr,
uint64_t cas,
memcached_storage_action_t verb)
{
uint64_t cas,
memcached_storage_action_t verb)
{
-
uint8_t
flush;
+
bool
flush;
protocol_binary_request_set request= {.bytes= {0}};
size_t send_length= sizeof(request.bytes);
protocol_binary_request_set request= {.bytes= {0}};
size_t send_length= sizeof(request.bytes);
- uint32_t server_key= memcached_generate_hash(ptr, master_key,
- master_key_length);
+ uint32_t server_key= memcached_generate_hash
_with_redistribution
(ptr, master_key,
+
master_key_length);
- memcached_server_
instance_st *
server=
+ memcached_server_
write_instance_st
server=
memcached_server_instance_fetch(ptr, server_key);
bool noreply= server->root->flags.no_reply;
memcached_server_instance_fetch(ptr, server_key);
bool noreply= server->root->flags.no_reply;
@@
-471,9
+471,9
@@
static memcached_return_t memcached_send_binary(memcached_st *ptr,
if (cas)
request.message.header.request.cas= htonll(cas);
if (cas)
request.message.header.request.cas= htonll(cas);
- flush= (
uint8_t
) ((server->root->flags.buffer_requests && verb == SET_OP) ? 0 : 1);
+ flush= (
bool
) ((server->root->flags.buffer_requests && verb == SET_OP) ? 0 : 1);
- if (server->root->flags.use_udp && !flush)
+ if (server->root->flags.use_udp && !
flush)
{
size_t cmd_size= send_length + key_length + value_length;
{
size_t cmd_size= send_length + key_length + value_length;
@@
-488,9
+488,9
@@
static memcached_return_t memcached_send_binary(memcached_st *ptr,
}
/* write the header */
}
/* write the header */
- if ((memcached_do(server, (const char*)request.bytes, send_length,
0
) != MEMCACHED_SUCCESS) ||
+ if ((memcached_do(server, (const char*)request.bytes, send_length,
false
) != MEMCACHED_SUCCESS) ||
(memcached_io_write(server, key, key_length, false) == -1) ||
(memcached_io_write(server, key, key_length, false) == -1) ||
- (memcached_io_write(server, value, value_length,
(char)
flush) == -1))
+ (memcached_io_write(server, value, value_length, flush) == -1))
{
memcached_io_reset(server);
return MEMCACHED_WRITE_FAILURE;
{
memcached_io_reset(server);
return MEMCACHED_WRITE_FAILURE;
@@
-502,7
+502,7
@@
static memcached_return_t memcached_send_binary(memcached_st *ptr,
for (uint32_t x= 0; x < ptr->number_of_replicas; x++)
{
for (uint32_t x= 0; x < ptr->number_of_replicas; x++)
{
- memcached_server_
instance_st *
instance;
+ memcached_server_
write_instance_st
instance;
++server_key;
if (server_key == memcached_server_count(ptr))
++server_key;
if (server_key == memcached_server_count(ptr))
@@
-511,9
+511,9
@@
static memcached_return_t memcached_send_binary(memcached_st *ptr,
instance= memcached_server_instance_fetch(ptr, server_key);
if ((memcached_do(instance, (const char*)request.bytes,
instance= memcached_server_instance_fetch(ptr, server_key);
if ((memcached_do(instance, (const char*)request.bytes,
- send_length,
0
) != MEMCACHED_SUCCESS) ||
+ send_length,
false
) != MEMCACHED_SUCCESS) ||
(memcached_io_write(instance, key, key_length, false) == -1) ||
(memcached_io_write(instance, key, key_length, false) == -1) ||
- (memcached_io_write(instance, value, value_length,
(char)
flush) == -1))
+ (memcached_io_write(instance, value, value_length, flush) == -1))
{
memcached_io_reset(instance);
}
{
memcached_io_reset(instance);
}
@@
-524,7
+524,7
@@
static memcached_return_t memcached_send_binary(memcached_st *ptr,
}
}
}
}
- if (flush ==
0
)
+ if (flush ==
false
)
{
return MEMCACHED_BUFFERED;
}
{
return MEMCACHED_BUFFERED;
}