projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Fixes for scanner/parser from OSX.
[awesomized/libmemcached]
/
libmemcached
/
get.cc
diff --git
a/libmemcached/get.cc
b/libmemcached/get.cc
index 88f8b56a1ed4285814c3248cbb47304cb8459d88..2a25d7883468d2701c009af7a573f0031b5f94ce 100644
(file)
--- a/
libmemcached/get.cc
+++ b/
libmemcached/get.cc
@@
-58,7
+58,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);
-char *memcached_get_by_key(memcached_st *
ptr
,
+char *memcached_get_by_key(memcached_st *
shell
,
const char *group_key,
size_t group_key_length,
const char *key, size_t key_length,
const char *group_key,
size_t group_key_length,
const char *key, size_t key_length,
@@
-66,6
+66,7
@@
char *memcached_get_by_key(memcached_st *ptr,
uint32_t *flags,
memcached_return_t *error)
{
uint32_t *flags,
memcached_return_t *error)
{
+ Memcached* ptr= memcached2Memcached(shell);
memcached_return_t unused;
if (error == NULL)
{
memcached_return_t unused;
if (error == NULL)
{
@@
-315,7
+316,7
@@
static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
}
hosts_connected++;
}
hosts_connected++;
- if ((memcached_io_writev(instance, vector,
4
, false)) == false)
+ if ((memcached_io_writev(instance, vector,
1
, false)) == false)
{
failures_occured_in_sending= true;
continue;
{
failures_occured_in_sending= true;
continue;
@@
-324,7
+325,7
@@
static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
memcached_instance_response_increment(instance);
WATCHPOINT_ASSERT(instance->cursor_active_ == 1);
}
memcached_instance_response_increment(instance);
WATCHPOINT_ASSERT(instance->cursor_active_ == 1);
}
- else
+
{
if ((memcached_io_writev(instance, (vector + 1), 3, false)) == false)
{
{
if ((memcached_io_writev(instance, (vector + 1), 3, false)) == false)
{
@@
-385,13
+386,14
@@
static memcached_return_t memcached_mget_by_key_real(memcached_st *ptr,
return MEMCACHED_FAILURE; // Complete failure occurred
}
return MEMCACHED_FAILURE; // Complete failure occurred
}
-memcached_return_t memcached_mget_by_key(memcached_st *
ptr
,
+memcached_return_t memcached_mget_by_key(memcached_st *
shell
,
const char *group_key,
size_t group_key_length,
const char * const *keys,
const size_t *key_length,
size_t number_of_keys)
{
const char *group_key,
size_t group_key_length,
const char * const *keys,
const size_t *key_length,
size_t number_of_keys)
{
+ Memcached* ptr= memcached2Memcached(shell);
return memcached_mget_by_key_real(ptr, group_key, group_key_length, keys,
key_length, number_of_keys, true);
}
return memcached_mget_by_key_real(ptr, group_key, group_key_length, keys,
key_length, number_of_keys, true);
}
@@
-409,7
+411,7
@@
memcached_return_t memcached_mget_execute(memcached_st *ptr,
context, number_of_callbacks);
}
context, number_of_callbacks);
}
-memcached_return_t memcached_mget_execute_by_key(memcached_st *
ptr
,
+memcached_return_t memcached_mget_execute_by_key(memcached_st *
shell
,
const char *group_key,
size_t group_key_length,
const char * const *keys,
const char *group_key,
size_t group_key_length,
const char * const *keys,
@@
-419,6
+421,7
@@
memcached_return_t memcached_mget_execute_by_key(memcached_st *ptr,
void *context,
unsigned int number_of_callbacks)
{
void *context,
unsigned int number_of_callbacks)
{
+ Memcached* ptr= memcached2Memcached(shell);
memcached_return_t rc;
if (memcached_failed(rc= initialize_query(ptr, false)))
{
memcached_return_t rc;
if (memcached_failed(rc= initialize_query(ptr, false)))
{