*/
#include <libmemcached/common.h>
-#include <cassert>
+#include <cstdarg>
#define MAX_ERROR_LENGTH 2048
struct memcached_error_t
errmsg_ptr,
at);
}
+ else if (rc == MEMCACHED_PARSE_ERROR and str and str->size)
+ {
+ error->size= (int)snprintf(error->message, MAX_ERROR_LENGTH, "%.*s -> %s",
+ int(str->size), str->c_str, at);
+ }
else if (str and str->size)
{
error->size= (int)snprintf(error->message, MAX_ERROR_LENGTH, "%s, %.*s -> %s",
memcached_return_t memcached_set_error(memcached_st& memc, memcached_return_t rc, const char *at, const char *str, size_t length)
{
- assert(rc != MEMCACHED_ERRNO);
+ assert_msg(rc != MEMCACHED_ERRNO, "Programmer error, MEMCACHED_ERRNO was set to be returned to client");
memcached_string_t tmp= { str, length };
return memcached_set_error(memc, rc, at, tmp);
}
memcached_return_t memcached_set_error(memcached_server_st& self, memcached_return_t rc, const char *at, const char *str, size_t length)
{
- assert(rc != MEMCACHED_ERRNO);
+ assert_msg(rc != MEMCACHED_ERRNO, "Programmer error, MEMCACHED_ERRNO was set to be returned to client");
+ assert_msg(rc != MEMCACHED_SOME_ERRORS, "Programmer error, MEMCACHED_SOME_ERRORS was about to be set on a memcached_server_st");
memcached_string_t tmp= { str, length };
return memcached_set_error(self, rc, at, tmp);
}
memcached_return_t memcached_set_error(memcached_st& memc, memcached_return_t rc, const char *at, memcached_string_t& str)
{
- assert(rc != MEMCACHED_ERRNO);
+ assert_msg(rc != MEMCACHED_ERRNO, "Programmer error, MEMCACHED_ERRNO was set to be returned to client");
if (memcached_success(rc))
return MEMCACHED_SUCCESS;
return rc;
}
+memcached_return_t memcached_set_parser_error(memcached_st& memc,
+ const char *at,
+ const char *format, ...)
+{
+ va_list args;
+
+ char buffer[BUFSIZ];
+ va_start(args, format);
+ int length= vsnprintf(buffer, sizeof(buffer), format, args);
+ va_end(args);
+
+ return memcached_set_error(memc, MEMCACHED_PARSE_ERROR, at, buffer, length);
+}
+
memcached_return_t memcached_set_error(memcached_server_st& self, memcached_return_t rc, const char *at, memcached_string_t& str)
{
- assert(rc != MEMCACHED_ERRNO);
+ assert_msg(rc != MEMCACHED_ERRNO, "Programmer error, MEMCACHED_ERRNO was set to be returned to client");
+ assert_msg(rc != MEMCACHED_SOME_ERRORS, "Programmer error, MEMCACHED_SOME_ERRORS was about to be set on a memcached_server_st");
if (memcached_success(rc))
return MEMCACHED_SUCCESS;
memcached_return_t memcached_set_error(memcached_server_st& self, memcached_return_t rc, const char *at)
{
- assert(rc != MEMCACHED_ERRNO);
+ assert_msg(rc != MEMCACHED_ERRNO, "Programmer error, MEMCACHED_ERRNO was set to be returned to client");
+ assert_msg(rc != MEMCACHED_SOME_ERRORS, "Programmer error, MEMCACHED_SOME_ERRORS was about to be set on a memcached_server_st");
if (memcached_success(rc))
return MEMCACHED_SUCCESS;
memcached_return_t memcached_set_error(memcached_st& self, memcached_return_t rc, const char *at)
{
- assert(rc != MEMCACHED_ERRNO);
+ assert_msg(rc != MEMCACHED_ERRNO, "Programmer error, MEMCACHED_ERRNO was set to be returned to client");
if (memcached_success(rc))
return MEMCACHED_SUCCESS;
static void _error_print(const memcached_error_t *error)
{
- if (not error)
+ if (error == NULL)
+ {
return;
+ }
- if (not error->size)
+ if (error->size == 0)
{
fprintf(stderr, "%s\n", memcached_strerror(NULL, error->rc) );
}
const char *memcached_last_error_message(memcached_st *memc)
{
- if (not memc)
+ if (memc == NULL)
+ {
return memcached_strerror(memc, MEMCACHED_INVALID_ARGUMENTS);
+ }
if (not memc->error_messages)
return memcached_strerror(memc, MEMCACHED_SUCCESS);
return memc->error_messages->message;
}
-
bool memcached_has_current_error(memcached_st &memc)
{
if (memc.error_messages
return false;
}
+bool memcached_has_current_error(memcached_server_st& server)
+{
+ return memcached_has_current_error(*(server.root));
+}
+
memcached_return_t memcached_last_error(memcached_st *memc)
{
- if (not memc)
+ if (memc == NULL)
+ {
return MEMCACHED_INVALID_ARGUMENTS;
+ }
if (not memc->error_messages)
return MEMCACHED_SUCCESS;
int memcached_last_error_errno(memcached_st *memc)
{
- if (not memc)
+ if (memc == NULL)
+ {
return 0;
+ }
if (not memc->error_messages)
+ {
return 0;
+ }
return memc->error_messages->local_errno;
}
const char *memcached_server_error(memcached_server_instance_st server)
{
- if (not server)
- return memcached_strerror(server->root, MEMCACHED_INVALID_ARGUMENTS);
+ if (server == NULL)
+ {
+ return NULL;
+ }
if (not server->error_messages)
return memcached_strerror(server->root, MEMCACHED_SUCCESS);
memcached_error_t *memcached_error_copy(const memcached_server_st& server)
{
- if (not server.error_messages)
+ if (server.error_messages == NULL)
+ {
return NULL;
+ }
memcached_error_t *error= (memcached_error_t *)libmemcached_malloc(server.root, sizeof(memcached_error_t));
memcpy(error, server.error_messages, sizeof(memcached_error_t));
memcached_return_t memcached_server_error_return(memcached_server_instance_st ptr)
{
+ if (ptr == NULL)
+ {
+ return MEMCACHED_INVALID_ARGUMENTS;
+ }
+
if (ptr and ptr->error_messages)
{
return ptr->error_messages->rc;
}
- return MEMCACHED_FAILURE;
+ return MEMCACHED_SUCCESS;
}