projects
/
m6w6
/
libmemcached
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
github
raw
|
patch
|
inline
| side by side (parent:
53aa302
)
Clean up interfaces so that 1.2 is a bit easier to upgrade too.
author
Brian Aker
<brian@tangent.org>
Tue, 29 Jan 2013 12:56:13 +0000
(07:56 -0500)
committer
Brian Aker
<brian@tangent.org>
Tue, 29 Jan 2013 12:56:13 +0000
(07:56 -0500)
libmemcached/array.c
patch
|
blob
|
history
libmemcached/array.h
patch
|
blob
|
history
libmemcached/auto.cc
patch
|
blob
|
history
libmemcached/error.cc
patch
|
blob
|
history
libmemcached/error.hpp
patch
|
blob
|
history
libmemcached/initialize_query.h
patch
|
blob
|
history
diff --git
a/libmemcached/array.c
b/libmemcached/array.c
index 5f9066ce9fd689254556f7e234288e04695ed1bb..cd472c3923e8ccd0973f51017638579279afab60 100644
(file)
--- a/
libmemcached/array.c
+++ b/
libmemcached/array.c
@@
-41,13
+41,13
@@
struct memcached_array_st
{
struct memcached_array_st
{
-
struct memcached_st
*root;
+
Memcached
*root;
size_t size;
char c_str[];
};
size_t size;
char c_str[];
};
-memcached_array_st *memcached_array_clone(
struct memcached_st
*memc, const memcached_array_st *original)
+memcached_array_st *memcached_array_clone(
Memcached
*memc, const memcached_array_st *original)
{
if (original)
{
{
if (original)
{
@@
-57,7
+57,7
@@
memcached_array_st *memcached_array_clone(struct memcached_st *memc, const memca
return NULL;
}
return NULL;
}
-memcached_array_st *memcached_strcpy(
struct memcached_st
*memc, const char *str, size_t str_length)
+memcached_array_st *memcached_strcpy(
Memcached
*memc, const char *str, size_t str_length)
{
assert(memc);
assert(str);
{
assert(memc);
assert(str);
diff --git
a/libmemcached/array.h
b/libmemcached/array.h
index 0f6e8d0cb68b3399ab4679bde16e1cbb582d2f06..afb3f916593fca992b45ec8d32ebe23cdd83a6d2 100644
(file)
--- a/
libmemcached/array.h
+++ b/
libmemcached/array.h
@@
-41,25
+41,18
@@
extern "C" {
#endif
extern "C" {
#endif
-LIBMEMCACHED_LOCAL
-memcached_array_st *memcached_array_clone(struct memcached_st *memc, const memcached_array_st *original);
+memcached_array_st *memcached_array_clone(Memcached* memc, const memcached_array_st *original);
-LIBMEMCACHED_LOCAL
-memcached_array_st *memcached_strcpy(struct memcached_st *memc, const char *str, size_t str_length);
+memcached_array_st *memcached_strcpy(Memcached* memc, const char *str, size_t str_length);
-LIBMEMCACHED_LOCAL
void memcached_array_free(memcached_array_st *array);
void memcached_array_free(memcached_array_st *array);
-LIBMEMCACHED_LOCAL
size_t memcached_array_size(memcached_array_st *array);
size_t memcached_array_size(memcached_array_st *array);
-LIBMEMCACHED_LOCAL
const char *memcached_array_string(memcached_array_st *array);
const char *memcached_array_string(memcached_array_st *array);
-LIBMEMCACHED_LOCAL
memcached_string_t memcached_array_to_string(memcached_array_st *array);
memcached_string_t memcached_array_to_string(memcached_array_st *array);
-LIBMEMCACHED_LOCAL
bool memcached_array_is_null(memcached_array_st *array);
#ifdef __cplusplus
bool memcached_array_is_null(memcached_array_st *array);
#ifdef __cplusplus
diff --git
a/libmemcached/auto.cc
b/libmemcached/auto.cc
index 57d6d2fdc00311e339d12f36efc9fea9cf3ef7c8..85e2ae091ace02aae5822f8d16f5a91bf533ccc1 100644
(file)
--- a/
libmemcached/auto.cc
+++ b/
libmemcached/auto.cc
@@
-54,7
+54,6
@@
static void auto_response(org::libmemcached::Instance* instance, const bool repl
if (memcached_fatal(rc))
{
if (memcached_fatal(rc))
{
- fprintf(stderr, "%s\n", memcached_strerror(NULL, rc));
assert(memcached_last_error(instance->root) != MEMCACHED_SUCCESS);
*value= UINT64_MAX;
}
assert(memcached_last_error(instance->root) != MEMCACHED_SUCCESS);
*value= UINT64_MAX;
}
diff --git
a/libmemcached/error.cc
b/libmemcached/error.cc
index 314f3623242898c735f49d90a561b220f7dcc557..64aefa037d88e4f4a0df7655bd3d1246ca41c513 100644
(file)
--- a/
libmemcached/error.cc
+++ b/
libmemcached/error.cc
@@
-43,7
+43,7
@@
#define MAX_ERROR_LENGTH 2048
struct memcached_error_t
{
#define MAX_ERROR_LENGTH 2048
struct memcached_error_t
{
-
memcached_st
*root;
+
Memcached
*root;
uint64_t query_id;
struct memcached_error_t *next;
memcached_return_t rc;
uint64_t query_id;
struct memcached_error_t *next;
memcached_return_t rc;
@@
-80,7
+80,7
@@
static void _set(org::libmemcached::Instance& server, Memcached& memc)
static int error_log_fd= -1;
#endif
static int error_log_fd= -1;
#endif
-static void _set(
memcached_st
& memc, memcached_string_t *str, memcached_return_t &rc, const char *at, int local_errno= 0)
+static void _set(
Memcached
& memc, memcached_string_t *str, memcached_return_t &rc, const char *at, int local_errno= 0)
{
if (memc.error_messages && memc.error_messages->query_id != memc.query_id)
{
{
if (memc.error_messages && memc.error_messages->query_id != memc.query_id)
{
@@
-208,7
+208,7
@@
static void _set(memcached_st& memc, memcached_string_t *str, memcached_return_t
#endif
}
#endif
}
-memcached_return_t memcached_set_error(
memcached_st
& memc, memcached_return_t rc, const char *at, const char *str, size_t length)
+memcached_return_t memcached_set_error(
Memcached
& memc, memcached_return_t rc, const char *at, const char *str, size_t length)
{
assert_msg(rc != MEMCACHED_ERRNO, "Programmer error, MEMCACHED_ERRNO was set to be returned to client");
memcached_string_t tmp= { str, length };
{
assert_msg(rc != MEMCACHED_ERRNO, "Programmer error, MEMCACHED_ERRNO was set to be returned to client");
memcached_string_t tmp= { str, length };
@@
-228,7
+228,7
@@
memcached_return_t memcached_set_error(org::libmemcached::Instance& self, memcac
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
#endif
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
#endif
-memcached_return_t memcached_set_error(
memcached_st
& memc, memcached_return_t rc, const char *at, memcached_string_t& str)
+memcached_return_t memcached_set_error(
Memcached
& memc, memcached_return_t rc, const char *at, memcached_string_t& str)
{
assert_msg(rc != MEMCACHED_ERRNO, "Programmer error, MEMCACHED_ERRNO was set to be returned to client");
if (memcached_fatal(rc) == false)
{
assert_msg(rc != MEMCACHED_ERRNO, "Programmer error, MEMCACHED_ERRNO was set to be returned to client");
if (memcached_fatal(rc) == false)
@@
-241,7
+241,7
@@
memcached_return_t memcached_set_error(memcached_st& memc, memcached_return_t rc
return rc;
}
return rc;
}
-memcached_return_t memcached_set_parser_error(
memcached_st
& memc,
+memcached_return_t memcached_set_parser_error(
Memcached
& memc,
const char *at,
const char *format, ...)
{
const char *at,
const char *format, ...)
{
@@
-337,7
+337,7
@@
memcached_return_t memcached_set_error(org::libmemcached::Instance& self, memcac
return rc;
}
return rc;
}
-memcached_return_t memcached_set_error(
memcached_st
& self, memcached_return_t rc, const char *at)
+memcached_return_t memcached_set_error(
Memcached
& self, memcached_return_t rc, const char *at)
{
assert_msg(rc != MEMCACHED_ERRNO, "Programmer error, MEMCACHED_ERRNO was set to be returned to client");
if (memcached_fatal(rc) == false)
{
assert_msg(rc != MEMCACHED_ERRNO, "Programmer error, MEMCACHED_ERRNO was set to be returned to client");
if (memcached_fatal(rc) == false)
@@
-350,7
+350,7
@@
memcached_return_t memcached_set_error(memcached_st& self, memcached_return_t rc
return rc;
}
return rc;
}
-memcached_return_t memcached_set_errno(
memcached_st
& self, int local_errno, const char *at, const char *str, size_t length)
+memcached_return_t memcached_set_errno(
Memcached
& self, int local_errno, const char *at, const char *str, size_t length)
{
memcached_string_t tmp= { str, length };
return memcached_set_errno(self, local_errno, at, tmp);
{
memcached_string_t tmp= { str, length };
return memcached_set_errno(self, local_errno, at, tmp);
@@
-362,7
+362,7
@@
memcached_return_t memcached_set_errno(org::libmemcached::Instance& self, int lo
return memcached_set_errno(self, local_errno, at, tmp);
}
return memcached_set_errno(self, local_errno, at, tmp);
}
-memcached_return_t memcached_set_errno(
memcached_st
& self, int local_errno, const char *at)
+memcached_return_t memcached_set_errno(
Memcached
& self, int local_errno, const char *at)
{
if (local_errno == 0)
{
{
if (local_errno == 0)
{
@@
-375,7
+375,7
@@
memcached_return_t memcached_set_errno(memcached_st& self, int local_errno, cons
return rc;
}
return rc;
}
-memcached_return_t memcached_set_errno(
memcached_st
& memc, int local_errno, const char *at, memcached_string_t& str)
+memcached_return_t memcached_set_errno(
Memcached
& memc, int local_errno, const char *at, memcached_string_t& str)
{
if (local_errno == 0)
{
{
if (local_errno == 0)
{
@@
-470,7
+470,7
@@
static void _error_print(const memcached_error_t *error)
_error_print(error->next);
}
_error_print(error->next);
}
-void memcached_error_print(const
memcached_st
*shell)
+void memcached_error_print(const
Memcached
*shell)
{
const Memcached* self= memcached2Memcached(shell);
if (self == NULL)
{
const Memcached* self= memcached2Memcached(shell);
if (self == NULL)
@@
-498,7
+498,7
@@
static void _error_free(memcached_error_t *error)
}
}
}
}
-void memcached_error_free(
memcached_st
& self)
+void memcached_error_free(
Memcached
& self)
{
_error_free(self.error_messages);
self.error_messages= NULL;
{
_error_free(self.error_messages);
self.error_messages= NULL;
@@
-542,7
+542,7
@@
const char *memcached_last_error_message(const memcached_st *shell)
return memcached_strerror(memc, MEMCACHED_INVALID_ARGUMENTS);
}
return memcached_strerror(memc, MEMCACHED_INVALID_ARGUMENTS);
}
-bool memcached_has_current_error(
memcached_st
&memc)
+bool memcached_has_current_error(
Memcached
&memc)
{
if (memc.error_messages
and memc.error_messages->query_id == memc.query_id
{
if (memc.error_messages
and memc.error_messages->query_id == memc.query_id
diff --git
a/libmemcached/error.hpp
b/libmemcached/error.hpp
index cdbc6ab15e0718e684d7a3d5b6073bf50b34d390..733f76868301f83e4f1a8c9679488ed3124c42dd 100644
(file)
--- a/
libmemcached/error.hpp
+++ b/
libmemcached/error.hpp
@@
-45,39
+45,39
@@
#define TOSTRING(x) STRINGIFY(x)
#define MEMCACHED_AT __FILE__ ":" TOSTRING(__LINE__)
#define TOSTRING(x) STRINGIFY(x)
#define MEMCACHED_AT __FILE__ ":" TOSTRING(__LINE__)
-memcached_return_t memcached_set_parser_error(
memcached_st
& memc,
+memcached_return_t memcached_set_parser_error(
Memcached
& memc,
const char *at,
const char *format, ...);
const char *at,
const char *format, ...);
-memcached_return_t memcached_set_error(
memcached_st
&, memcached_return_t rc, const char *at);
+memcached_return_t memcached_set_error(
Memcached
&, memcached_return_t rc, const char *at);
memcached_return_t memcached_set_error(org::libmemcached::Instance&, memcached_return_t rc, const char *at);
memcached_return_t memcached_set_error(org::libmemcached::Instance&, memcached_return_t rc, const char *at);
-memcached_return_t memcached_set_error(
memcached_st
&, memcached_return_t rc, const char *at, const char *str, size_t length);
+memcached_return_t memcached_set_error(
Memcached
&, memcached_return_t rc, const char *at, const char *str, size_t length);
memcached_return_t memcached_set_error(org::libmemcached::Instance&, memcached_return_t rc, const char *at, const char *str, size_t length);
memcached_return_t memcached_set_error(org::libmemcached::Instance&, memcached_return_t rc, const char *at, const char *str, size_t length);
-memcached_return_t memcached_set_error(
memcached_st
& memc, memcached_return_t rc, const char *at, memcached_string_t& str);
+memcached_return_t memcached_set_error(
Memcached
& memc, memcached_return_t rc, const char *at, memcached_string_t& str);
memcached_return_t memcached_set_error(org::libmemcached::Instance&, memcached_return_t rc, const char *at, memcached_string_t& str);
memcached_return_t memcached_set_error(org::libmemcached::Instance&, memcached_return_t rc, const char *at, memcached_string_t& str);
-memcached_return_t memcached_set_errno(
memcached_st
& memc, int local_errno, const char *at, memcached_string_t& str);
+memcached_return_t memcached_set_errno(
Memcached
& memc, int local_errno, const char *at, memcached_string_t& str);
memcached_return_t memcached_set_errno(org::libmemcached::Instance&, int local_errno, const char *at, memcached_string_t& str);
memcached_return_t memcached_set_errno(org::libmemcached::Instance&, int local_errno, const char *at, memcached_string_t& str);
-memcached_return_t memcached_set_errno(
memcached_st
& memc, int local_errno, const char *at, const char *str, size_t length);
+memcached_return_t memcached_set_errno(
Memcached
& memc, int local_errno, const char *at, const char *str, size_t length);
memcached_return_t memcached_set_errno(org::libmemcached::Instance&, int local_errno, const char *at, const char *str, size_t length);
memcached_return_t memcached_set_errno(org::libmemcached::Instance&, int local_errno, const char *at, const char *str, size_t length);
-memcached_return_t memcached_set_errno(
memcached_st
& memc, int local_errno, const char *at);
+memcached_return_t memcached_set_errno(
Memcached
& memc, int local_errno, const char *at);
memcached_return_t memcached_set_errno(org::libmemcached::Instance&, int local_errno, const char *at);
memcached_return_t memcached_set_errno(org::libmemcached::Instance&, int local_errno, const char *at);
-bool memcached_has_current_error(
memcached_st
&);
+bool memcached_has_current_error(
Memcached
&);
bool memcached_has_current_error(org::libmemcached::Instance&);
bool memcached_has_current_error(org::libmemcached::Instance&);
-void memcached_error_free(
memcached_st
&);
+void memcached_error_free(
Memcached
&);
void memcached_error_free(memcached_server_st&);
void memcached_error_free(memcached_server_st&);
diff --git
a/libmemcached/initialize_query.h
b/libmemcached/initialize_query.h
index 943a37a3b996532801e4d030a36bf02610ec9103..105283c0c957bd89a274411b4da888befe288ac5 100644
(file)
--- a/
libmemcached/initialize_query.h
+++ b/
libmemcached/initialize_query.h
@@
-36,6
+36,6
@@
#pragma once
#pragma once
-memcached_return_t initialize_query(
memcached_st
*self, bool increment_query_id);
+memcached_return_t initialize_query(
Memcached
*self, bool increment_query_id);
-memcached_return_t initialize_const_query(const
memcached_st
*self);
+memcached_return_t initialize_const_query(const
Memcached
*self);