Merge up trunk

[m6w6/libmemcached] / libmemcached / error.cc

diff --git a/libmemcached/error.cc b/libmemcached/error.cc
index 1f3b172ca170d87ca7c3b51b64e9b030ff6bc286..5afb22824a3c0932bce7ab5e499010345973f34e 100644 (file)
--- a/libmemcached/error.cc
+++ b/libmemcached/error.cc
@@ -36,7 +36,7 @@
  */
 
 #include <libmemcached/common.h>
-#include <cassert>
+#include <cstdarg>
 
 #define MAX_ERROR_LENGTH 2048
 struct memcached_error_t
@@ -148,6 +148,11 @@ static void _set(memcached_st& memc, memcached_string_t *str, memcached_return_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", 
@@ -166,22 +171,22 @@ static void _set(memcached_st& memc, memcached_string_t *str, memcached_return_t
 
 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(rc != MEMCACHED_SOME_ERRORS);
+  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;
 
@@ -190,10 +195,24 @@ memcached_return_t memcached_set_error(memcached_st& memc, memcached_return_t rc
   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(rc != MEMCACHED_SOME_ERRORS);
+  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;
 
@@ -224,8 +243,8 @@ memcached_return_t memcached_set_error(memcached_server_st& self, memcached_retu
 
 memcached_return_t memcached_set_error(memcached_server_st& self, memcached_return_t rc, const char *at)
 {
-  assert(rc != MEMCACHED_ERRNO);
-  assert(rc != MEMCACHED_SOME_ERRORS);
+  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;
 
@@ -245,7 +264,7 @@ memcached_return_t memcached_set_error(memcached_server_st& self, memcached_retu
 
 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;
 
@@ -408,7 +427,6 @@ const char *memcached_last_error_message(memcached_st *memc)
   return memc->error_messages->message;
 }
 
-
 bool memcached_has_current_error(memcached_st &memc)
 {
   if (memc.error_messages 
@@ -421,6 +439,11 @@ bool memcached_has_current_error(memcached_st &memc)
   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)