libmemcached: sasl (fix #14 and #17)

[awesomized/libmemcached] / libmemcached-1.0 / return.h

diff --git a/libmemcached-1.0/return.h b/libmemcached-1.0/return.h
index e5788c507eacceea66cf445188bb482cd2f269f4..e2b4104cda6c526249cb88abab790e35392bd611 100644 (file)
--- a/libmemcached-1.0/return.h
+++ b/libmemcached-1.0/return.h
@@ -36,63 +36,6 @@
 
 #pragma once
 
-enum memcached_return_t {
-  MEMCACHED_SUCCESS,
-  MEMCACHED_FAILURE,
-  MEMCACHED_HOST_LOOKUP_FAILURE, // getaddrinfo() and getnameinfo() only
-  MEMCACHED_CONNECTION_FAILURE,
-  MEMCACHED_CONNECTION_BIND_FAILURE,  // DEPRECATED, see MEMCACHED_HOST_LOOKUP_FAILURE
-  MEMCACHED_WRITE_FAILURE,
-  MEMCACHED_READ_FAILURE,
-  MEMCACHED_UNKNOWN_READ_FAILURE,
-  MEMCACHED_PROTOCOL_ERROR,
-  MEMCACHED_CLIENT_ERROR,
-  MEMCACHED_SERVER_ERROR,
-  MEMCACHED_CONNECTION_SOCKET_CREATE_FAILURE, // DEPRECATED
-  MEMCACHED_DATA_EXISTS,
-  MEMCACHED_DATA_DOES_NOT_EXIST,
-  MEMCACHED_NOTSTORED,
-  MEMCACHED_STORED,
-  MEMCACHED_NOTFOUND,
-  MEMCACHED_MEMORY_ALLOCATION_FAILURE,
-  MEMCACHED_PARTIAL_READ,
-  MEMCACHED_SOME_ERRORS,
-  MEMCACHED_NO_SERVERS,
-  MEMCACHED_END,
-  MEMCACHED_DELETED,
-  MEMCACHED_VALUE,
-  MEMCACHED_STAT,
-  MEMCACHED_ITEM,
-  MEMCACHED_ERRNO,
-  MEMCACHED_FAIL_UNIX_SOCKET, // DEPRECATED
-  MEMCACHED_NOT_SUPPORTED,
-  MEMCACHED_NO_KEY_PROVIDED, /* Deprecated. Use MEMCACHED_BAD_KEY_PROVIDED! */
-  MEMCACHED_FETCH_NOTFINISHED,
-  MEMCACHED_TIMEOUT,
-  MEMCACHED_BUFFERED,
-  MEMCACHED_BAD_KEY_PROVIDED,
-  MEMCACHED_INVALID_HOST_PROTOCOL,
-  MEMCACHED_SERVER_MARKED_DEAD,
-  MEMCACHED_UNKNOWN_STAT_KEY,
-  MEMCACHED_E2BIG,
-  MEMCACHED_INVALID_ARGUMENTS,
-  MEMCACHED_KEY_TOO_BIG,
-  MEMCACHED_AUTH_PROBLEM,
-  MEMCACHED_AUTH_FAILURE,
-  MEMCACHED_AUTH_CONTINUE,
-  MEMCACHED_PARSE_ERROR,
-  MEMCACHED_PARSE_USER_ERROR,
-  MEMCACHED_DEPRECATED,
-  MEMCACHED_IN_PROGRESS,
-  MEMCACHED_SERVER_TEMPORARILY_DISABLED,
-  MEMCACHED_SERVER_MEMORY_ALLOCATION_FAILURE,
-  MEMCACHED_MAXIMUM_RETURN /* Always add new error code before */
-};
-
-#ifndef __cplusplus
-typedef enum memcached_return_t memcached_return_t;
-#endif
-
 static inline bool memcached_success(memcached_return_t rc)
 {
   return (rc == MEMCACHED_BUFFERED ||
@@ -107,23 +50,34 @@ static inline bool memcached_success(memcached_return_t rc)
 
 static inline bool memcached_failed(memcached_return_t rc)
 {
-  return (rc != MEMCACHED_SUCCESS && 
+  return (rc != MEMCACHED_AUTH_CONTINUE &&
+          rc != MEMCACHED_BUFFERED &&
+          rc != MEMCACHED_DELETED &&
           rc != MEMCACHED_END && 
+          rc != MEMCACHED_ITEM &&
+          rc != MEMCACHED_STAT &&
           rc != MEMCACHED_STORED && 
-          rc != MEMCACHED_STAT && 
-          rc != MEMCACHED_DELETED &&
-          rc != MEMCACHED_BUFFERED &&
+          rc != MEMCACHED_SUCCESS &&
           rc != MEMCACHED_VALUE);
 }
 
 static inline bool memcached_fatal(memcached_return_t rc)
 {
-  return (rc != MEMCACHED_SUCCESS && 
+  return (rc != MEMCACHED_AUTH_CONTINUE &&
+          rc != MEMCACHED_BUFFERED &&
+          rc != MEMCACHED_CLIENT_ERROR &&
+          rc != MEMCACHED_DATA_EXISTS &&
+          rc != MEMCACHED_DELETED &&
+          rc != MEMCACHED_E2BIG && 
           rc != MEMCACHED_END && 
-          rc != MEMCACHED_STORED && 
+          rc != MEMCACHED_ITEM &&
+          rc != MEMCACHED_ERROR &&
+          rc != MEMCACHED_NOTFOUND && 
+          rc != MEMCACHED_NOTSTORED && 
+          rc != MEMCACHED_SERVER_MEMORY_ALLOCATION_FAILURE && 
           rc != MEMCACHED_STAT && 
-          rc != MEMCACHED_DELETED &&
-          rc != MEMCACHED_BUFFERED &&
+          rc != MEMCACHED_STORED && 
+          rc != MEMCACHED_SUCCESS && 
           rc != MEMCACHED_VALUE);
 }