Fix server messages (clean up errors in general).

[m6w6/libmemcached] / libmemcached / strerror.cc

diff --git a/libmemcached/strerror.cc b/libmemcached/strerror.cc
index 3688a66bcc678bf50ecd9764fdf4bacedc49ca53..7a4e0a82d1c1811f36fbf1469736d86e55602eb3 100644 (file)
--- a/libmemcached/strerror.cc
+++ b/libmemcached/strerror.cc
@@ -37,7 +37,7 @@
 
 #include <libmemcached/common.h>
 
-const char *memcached_strerror(memcached_st *, memcached_return_t rc)
+const char *memcached_strerror(const memcached_st *, memcached_return_t rc)
 {
   switch (rc)
   {
@@ -74,8 +74,8 @@ const char *memcached_strerror(memcached_st *, memcached_return_t rc)
   case MEMCACHED_WRITE_FAILURE:
     return "WRITE FAILURE";
 
-  case MEMCACHED_CONNECTION_SOCKET_CREATE_FAILURE: // DEPRECATED
-    return "CONNECTION SOCKET CREATE FAILURE";
+  case MEMCACHED_ERROR:
+    return "ERROR was returned by server";
 
   case MEMCACHED_DATA_EXISTS:
     return "CONNECTION DATA EXISTS";
@@ -182,6 +182,12 @@ const char *memcached_strerror(memcached_st *, memcached_return_t rc)
   case MEMCACHED_IN_PROGRESS:
     return "OPERATION IN PROCESS";
 
+  case MEMCACHED_SERVER_TEMPORARILY_DISABLED:
+    return "SERVER HAS FAILED AND IS DISABLED UNTIL TIMED RETRY";
+
+  case MEMCACHED_SERVER_MEMORY_ALLOCATION_FAILURE:
+    return "SERVER FAILED TO ALLOCATE OBJECT";
+
   default:
   case MEMCACHED_MAXIMUM_RETURN:
     return "INVALID memcached_return_t";