Merge in fix for additional logic for timeouts.

[awesomized/libmemcached] / libmemcached / strerror.cc

diff --git a/libmemcached/strerror.cc b/libmemcached/strerror.cc
index 682072c14a30f4e9db3782c98a5463279d30d775..d378182427e60154a022d1d5e26692163e772c14 100644 (file)
--- a/libmemcached/strerror.cc
+++ b/libmemcached/strerror.cc
@@ -1,8 +1,44 @@
-#include "common.h"
+/*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+ * 
+ *  Libmemcached library
+ *
+ *  Copyright (C) 2011 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
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *      * Redistributions of source code must retain the above copyright
+ *  notice, this list of conditions and the following disclaimer.
+ *
+ *      * Redistributions in binary form must reproduce the above
+ *  copyright notice, this list of conditions and the following disclaimer
+ *  in the documentation and/or other materials provided with the
+ *  distribution.
+ *
+ *      * The names of its contributors may not be used to endorse or
+ *  promote products derived from this software without specific prior
+ *  written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
 
-const char *memcached_strerror(memcached_st *ptr, memcached_return_t rc)
+#include <libmemcached/common.h>
+
+const char *memcached_strerror(memcached_st *, memcached_return_t rc)
 {
-  (void)ptr;
   switch (rc)
   {
   case MEMCACHED_SUCCESS:
@@ -11,9 +47,9 @@ const char *memcached_strerror(memcached_st *ptr, memcached_return_t rc)
     return "FAILURE";
   case MEMCACHED_HOST_LOOKUP_FAILURE: // getaddrinfo only
     return "getaddrinfo() HOSTNAME LOOKUP FAILURE";
-  case MEMCACHED_CONNECTION_FAILURE: // DEPRECATED
+  case MEMCACHED_CONNECTION_FAILURE:
     return "CONNECTION FAILURE";
-  case MEMCACHED_CONNECTION_BIND_FAILURE:
+  case MEMCACHED_CONNECTION_BIND_FAILURE: // DEPRECATED, see MEMCACHED_HOST_LOOKUP_FAILURE
     return "CONNECTION BIND FAILURE";
   case MEMCACHED_READ_FAILURE:
     return "READ FAILURE";
@@ -97,9 +133,8 @@ const char *memcached_strerror(memcached_st *ptr, memcached_return_t rc)
     return "USER INITIATED ERROR OCCURED WHILE PARSING";
   case MEMCACHED_DEPRECATED:
     return "DEPRECATED";
-  case MEMCACHED_MAXIMUM_RETURN:
-    return "Gibberish returned!";
   default:
-    return "Gibberish returned!";
+  case MEMCACHED_MAXIMUM_RETURN:
+    return "INVALID memcached_return_t";
   }
 }