projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
attempt to fix #12, #49 and #65
[awesomized/libmemcached]
/
libmemcached
/
touch.cc
diff --git
a/libmemcached/touch.cc
b/libmemcached/touch.cc
index 0c24aed19653bab758729923821967fd7bf51892..a638bf9f7e3265f9f01927cf315215143bb709a7 100644
(file)
--- a/
libmemcached/touch.cc
+++ b/
libmemcached/touch.cc
@@
-38,7
+38,7
@@
#include <libmemcached/common.h>
#include <libmemcached/memcached/protocol_binary.h>
#include <libmemcached/common.h>
#include <libmemcached/memcached/protocol_binary.h>
-static memcached_return_t ascii_touch(
org::libmemcached::Instance
* instance,
+static memcached_return_t ascii_touch(
memcached_instance_st
* instance,
const char *key, size_t key_length,
time_t expiration)
{
const char *key, size_t key_length,
time_t expiration)
{
@@
-63,14
+63,13
@@
static memcached_return_t ascii_touch(org::libmemcached::Instance* instance,
memcached_return_t rc;
if (memcached_failed(rc= memcached_vdo(instance, vector, 6, true)))
{
memcached_return_t rc;
if (memcached_failed(rc= memcached_vdo(instance, vector, 6, true)))
{
- memcached_io_reset(instance);
return memcached_set_error(*instance, MEMCACHED_WRITE_FAILURE, MEMCACHED_AT);
}
return rc;
}
return memcached_set_error(*instance, MEMCACHED_WRITE_FAILURE, MEMCACHED_AT);
}
return rc;
}
-static memcached_return_t binary_touch(
org::libmemcached::Instance
* instance,
+static memcached_return_t binary_touch(
memcached_instance_st
* instance,
const char *key, size_t key_length,
time_t expiration)
{
const char *key, size_t key_length,
time_t expiration)
{
@@
-96,7
+95,6
@@
static memcached_return_t binary_touch(org::libmemcached::Instance* instance,
memcached_return_t rc;
if (memcached_failed(rc= memcached_vdo(instance, vector, 4, true)))
{
memcached_return_t rc;
if (memcached_failed(rc= memcached_vdo(instance, vector, 4, true)))
{
- memcached_io_reset(instance);
return memcached_set_error(*instance, MEMCACHED_WRITE_FAILURE, MEMCACHED_AT);
}
return memcached_set_error(*instance, MEMCACHED_WRITE_FAILURE, MEMCACHED_AT);
}
@@
-124,13
+122,13
@@
memcached_return_t memcached_touch_by_key(memcached_st *shell,
return rc;
}
return rc;
}
- if (memcached_failed(rc= memcached_
validate_key_length(key_length, ptr->flags.binary_protocol
)))
+ if (memcached_failed(rc= memcached_
key_test(*ptr, (const char **)&key, &key_length, 1
)))
{
{
- return
rc
;
+ return
memcached_set_error(*ptr, rc, MEMCACHED_AT)
;
}
uint32_t server_key= memcached_generate_hash_with_redistribution(ptr, group_key, group_key_length);
}
uint32_t server_key= memcached_generate_hash_with_redistribution(ptr, group_key, group_key_length);
-
org::libmemcached::Instance
* instance= memcached_instance_fetch(ptr, server_key);
+
memcached_instance_st
* instance= memcached_instance_fetch(ptr, server_key);
if (ptr->flags.binary_protocol)
{
if (ptr->flags.binary_protocol)
{