projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Remove exposed C++ namespace.
[m6w6/libmemcached]
/
libmemcached
/
fetch.cc
diff --git
a/libmemcached/fetch.cc
b/libmemcached/fetch.cc
index 2fd0dc51e845a96a4f02194ec6e9679958936bdb..7f677d023e57aacaf43b9ef9d17059e637645b56 100644
(file)
--- a/
libmemcached/fetch.cc
+++ b/
libmemcached/fetch.cc
@@
-2,7
+2,7
@@
*
* Libmemcached library
*
*
* Libmemcached library
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Copyright (C) 2011
-2012
Data Differential, http://datadifferential.com/
* Copyright (C) 2006-2009 Brian Aker All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* Copyright (C) 2006-2009 Brian Aker All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@
-37,12
+37,12
@@
#include <libmemcached/common.h>
#include <libmemcached/common.h>
-char *memcached_fetch(memcached_st *
ptr
, char *key, size_t *key_length,
+char *memcached_fetch(memcached_st *
shell
, char *key, size_t *key_length,
size_t *value_length,
uint32_t *flags,
memcached_return_t *error)
{
size_t *value_length,
uint32_t *flags,
memcached_return_t *error)
{
-
memcached_result_st *result_buffer= &ptr->result
;
+
Memcached* ptr= memcached2Memcached(shell)
;
memcached_return_t unused;
if (error == NULL)
{
memcached_return_t unused;
if (error == NULL)
{
@@
-75,6
+75,7
@@
char *memcached_fetch(memcached_st *ptr, char *key, size_t *key_length,
return NULL;
}
return NULL;
}
+ memcached_result_st *result_buffer= &ptr->result;
result_buffer= memcached_fetch_result(ptr, result_buffer, error);
if (result_buffer == NULL or memcached_failed(*error))
{
result_buffer= memcached_fetch_result(ptr, result_buffer, error);
if (result_buffer == NULL or memcached_failed(*error))
{
@@
-192,7
+193,8
@@
memcached_result_st *memcached_fetch_result(memcached_st *ptr,
*error= MEMCACHED_MAXIMUM_RETURN; // We use this to see if we ever go into the loop
memcached_instance_st *server;
*error= MEMCACHED_MAXIMUM_RETURN; // We use this to see if we ever go into the loop
memcached_instance_st *server;
- while ((server= memcached_io_get_readable_server(ptr)))
+ memcached_return_t read_ret= MEMCACHED_SUCCESS;
+ while ((server= memcached_io_get_readable_server(ptr, read_ret)))
{
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
*error= memcached_response(server, buffer, sizeof(buffer), result);
{
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
*error= memcached_response(server, buffer, sizeof(buffer), result);
@@
-251,11
+253,12
@@
memcached_result_st *memcached_fetch_result(memcached_st *ptr,
return NULL;
}
return NULL;
}
-memcached_return_t memcached_fetch_execute(memcached_st *
ptr
,
+memcached_return_t memcached_fetch_execute(memcached_st *
shell
,
memcached_execute_fn *callback,
void *context,
uint32_t number_of_callbacks)
{
memcached_execute_fn *callback,
void *context,
uint32_t number_of_callbacks)
{
+ Memcached* ptr= memcached2Memcached(shell);
memcached_result_st *result= &ptr->result;
memcached_return_t rc;
bool some_errors= false;
memcached_result_st *result= &ptr->result;
memcached_return_t rc;
bool some_errors= false;