projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Use bool instead of bool:1 if your compiler doesn't create correct code
[awesomized/libmemcached]
/
libmemcached
/
get.c
diff --git
a/libmemcached/get.c
b/libmemcached/get.c
index 97f1c29940258813f41f0e068b6c2c03ff9399e4..ba4d4bc3b479b83ec7a516ee085de8569e26f29f 100644
(file)
--- a/
libmemcached/get.c
+++ b/
libmemcached/get.c
@@
-144,7
+144,7
@@
static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
size_t number_of_keys,
bool mget_mode)
{
size_t number_of_keys,
bool mget_mode)
{
- u
nsigned in
t x;
+ u
int32_
t x;
memcached_return_t rc= MEMCACHED_NOTFOUND;
const char *get_command= "get ";
uint8_t get_command_length= 4;
memcached_return_t rc= MEMCACHED_NOTFOUND;
const char *get_command= "get ";
uint8_t get_command_length= 4;
@@
-189,7
+189,7
@@
static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
if (ptr->flags.no_block)
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
if (ptr->flags.no_block)
- (void)memcached_io_write(instance, NULL, 0,
1
);
+ (void)memcached_io_write(instance, NULL, 0,
true
);
while(memcached_server_response_count(instance))
(void)memcached_response(instance, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, &ptr->result);
while(memcached_server_response_count(instance))
(void)memcached_response(instance, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, &ptr->result);
@@
-233,7
+233,7
@@
static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
if (rc != MEMCACHED_SUCCESS)
continue;
if (rc != MEMCACHED_SUCCESS)
continue;
- if ((memcached_io_write(instance, get_command, get_command_length,
0
)) == -1)
+ if ((memcached_io_write(instance, get_command, get_command_length,
false
)) == -1)
{
rc= MEMCACHED_SOME_ERRORS;
continue;
{
rc= MEMCACHED_SOME_ERRORS;
continue;
@@
-244,9
+244,9
@@
static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
}
/* Only called when we have a prefix key */
}
/* Only called when we have a prefix key */
- if (ptr->prefix_key
[0] != 0
)
+ if (ptr->prefix_key
_length
)
{
{
- if ((memcached_io_write(instance, ptr->prefix_key, ptr->prefix_key_length,
0
)) == -1)
+ if ((memcached_io_write(instance, ptr->prefix_key, ptr->prefix_key_length,
false
)) == -1)
{
memcached_server_response_reset(instance);
rc= MEMCACHED_SOME_ERRORS;
{
memcached_server_response_reset(instance);
rc= MEMCACHED_SOME_ERRORS;
@@
-254,14
+254,14
@@
static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
}
}
}
}
- if ((memcached_io_write(instance, keys[x], key_length[x],
0
)) == -1)
+ if ((memcached_io_write(instance, keys[x], key_length[x],
false
)) == -1)
{
memcached_server_response_reset(instance);
rc= MEMCACHED_SOME_ERRORS;
continue;
}
{
memcached_server_response_reset(instance);
rc= MEMCACHED_SOME_ERRORS;
continue;
}
- if ((memcached_io_write(instance, " ", 1,
0
)) == -1)
+ if ((memcached_io_write(instance, " ", 1,
false
)) == -1)
{
memcached_server_response_reset(instance);
rc= MEMCACHED_SOME_ERRORS;
{
memcached_server_response_reset(instance);
rc= MEMCACHED_SOME_ERRORS;
@@
-280,7
+280,7
@@
static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
if (memcached_server_response_count(instance))
{
/* We need to do something about non-connnected hosts in the future */
if (memcached_server_response_count(instance))
{
/* We need to do something about non-connnected hosts in the future */
- if ((memcached_io_write(instance, "\r\n", 2,
1
)) == -1)
+ if ((memcached_io_write(instance, "\r\n", 2,
true
)) == -1)
{
rc= MEMCACHED_SOME_ERRORS;
}
{
rc= MEMCACHED_SOME_ERRORS;
}
@@
-407,9
+407,9
@@
static memcached_return_t simple_binary_mget(memcached_st *ptr,
request.message.header.request.bodylen= htonl((uint32_t) key_length[x]);
if ((memcached_io_write(instance, request.bytes,
request.message.header.request.bodylen= htonl((uint32_t) key_length[x]);
if ((memcached_io_write(instance, request.bytes,
- sizeof(request.bytes),
0
) == -1) ||
+ sizeof(request.bytes),
false
) == -1) ||
(memcached_io_write(instance, keys[x],
(memcached_io_write(instance, keys[x],
- key_length[x],
(char)
flush) == -1))
+ key_length[x], flush) == -1))
{
memcached_server_response_reset(instance);
rc= MEMCACHED_SOME_ERRORS;
{
memcached_server_response_reset(instance);
rc= MEMCACHED_SOME_ERRORS;
@@
-441,7
+441,7
@@
static memcached_return_t simple_binary_mget(memcached_st *ptr,
if (memcached_server_response_count(instance))
{
if (memcached_server_response_count(instance))
{
- if (memcached_io_write(instance, NULL, 0,
1
) == -1)
+ if (memcached_io_write(instance, NULL, 0,
true
) == -1)
{
memcached_server_response_reset(instance);
memcached_io_reset(instance);
{
memcached_server_response_reset(instance);
memcached_io_reset(instance);
@@
-449,7
+449,7
@@
static memcached_return_t simple_binary_mget(memcached_st *ptr,
}
if (memcached_io_write(instance, request.bytes,
}
if (memcached_io_write(instance, request.bytes,
- sizeof(request.bytes),
1
) == -1)
+ sizeof(request.bytes),
true
) == -1)
{
memcached_server_response_reset(instance);
memcached_io_reset(instance);
{
memcached_server_response_reset(instance);
memcached_io_reset(instance);
@@
-536,9
+536,9
@@
static memcached_return_t replication_binary_mget(memcached_st *ptr,
* just make sure we work _correctly_
*/
if ((memcached_io_write(instance, request.bytes,
* just make sure we work _correctly_
*/
if ((memcached_io_write(instance, request.bytes,
- sizeof(request.bytes),
0
) == -1) ||
+ sizeof(request.bytes),
false
) == -1) ||
(memcached_io_write(instance, keys[x],
(memcached_io_write(instance, keys[x],
- key_length[x],
1
) == -1))
+ key_length[x],
true
) == -1))
{
memcached_io_reset(instance);
dead_servers[server]= true;
{
memcached_io_reset(instance);
dead_servers[server]= true;
@@
-577,28
+577,36
@@
static memcached_return_t binary_mget_by_key(memcached_st *ptr,
uint32_t* hash;
bool* dead_servers;
uint32_t* hash;
bool* dead_servers;
- hash=
ptr->call
_malloc(ptr, sizeof(uint32_t) * number_of_keys);
- dead_servers=
ptr->call
_calloc(ptr, memcached_server_count(ptr), sizeof(bool));
+ hash=
libmemcached
_malloc(ptr, sizeof(uint32_t) * number_of_keys);
+ dead_servers=
libmemcached
_calloc(ptr, memcached_server_count(ptr), sizeof(bool));
if (hash == NULL || dead_servers == NULL)
{
if (hash == NULL || dead_servers == NULL)
{
-
ptr->call
_free(ptr, hash);
-
ptr->call
_free(ptr, dead_servers);
+
libmemcached
_free(ptr, hash);
+
libmemcached
_free(ptr, dead_servers);
return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
}
if (is_master_key_set)
return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
}
if (is_master_key_set)
- for (unsigned int x= 0; x < number_of_keys; x++)
+ {
+ for (size_t x= 0; x < number_of_keys; x++)
+ {
hash[x]= master_server_key;
hash[x]= master_server_key;
+ }
+ }
else
else
- for (unsigned int x= 0; x < number_of_keys; x++)
+ {
+ for (size_t x= 0; x < number_of_keys; x++)
+ {
hash[x]= memcached_generate_hash(ptr, keys[x], key_length[x]);
hash[x]= memcached_generate_hash(ptr, keys[x], key_length[x]);
+ }
+ }
rc= replication_binary_mget(ptr, hash, dead_servers, keys,
key_length, number_of_keys);
rc= replication_binary_mget(ptr, hash, dead_servers, keys,
key_length, number_of_keys);
-
ptr->call
_free(ptr, hash);
-
ptr->call
_free(ptr, dead_servers);
+
libmemcached
_free(ptr, hash);
+
libmemcached
_free(ptr, dead_servers);
return MEMCACHED_SUCCESS;
}
return MEMCACHED_SUCCESS;
}