Merge in all changes related to being able to read configuration files.

[awesomized/libmemcached] / libmemcached / behavior.c

diff --git a/libmemcached/behavior.c b/libmemcached/behavior.c
index da111351bee3a942c43f643e4f9861557478639c..5116b645fe783efabb5d817a98c03ef256e086ca 100644 (file)
--- a/libmemcached/behavior.c
+++ b/libmemcached/behavior.c
@@ -317,18 +317,18 @@ uint64_t memcached_behavior_get(memcached_st *ptr,
         /* We just try the first host, and if it is down we return zero */
         if ((memcached_connect(instance)) != MEMCACHED_SUCCESS)
         {
-          return EXIT_SUCCESS;
+          return 0;
         }
 
         if (memcached_io_wait_for_write(instance) != MEMCACHED_SUCCESS)
         {
-          return EXIT_SUCCESS;
+          return 0;
         }
 
         if (getsockopt(instance->fd, SOL_SOCKET, SO_SNDBUF, &sock_size, &sock_length) < 0)
         {
           ptr->cached_errno= errno;
-          return EXIT_SUCCESS; /* Zero means error */
+          return 0; /* Zero means error */
         }
       }
 
@@ -353,18 +353,18 @@ uint64_t memcached_behavior_get(memcached_st *ptr,
         /* We just try the first host, and if it is down we return zero */
         if ((memcached_connect(instance)) != MEMCACHED_SUCCESS)
         {
-          return EXIT_SUCCESS;
+          return 0;
         }
 
         if (memcached_io_wait_for_write(instance) != MEMCACHED_SUCCESS)
         {
-          return EXIT_SUCCESS;
+          return 0;
         }
 
         if (getsockopt(instance->fd, SOL_SOCKET, SO_RCVBUF, &sock_size, &sock_length) < 0)
         {
           ptr->cached_errno= errno;
-          return EXIT_SUCCESS; /* Zero means error */
+          return 0; /* Zero means error */
         }
 
       }
@@ -390,7 +390,7 @@ uint64_t memcached_behavior_get(memcached_st *ptr,
   case MEMCACHED_BEHAVIOR_MAX:
   default:
     WATCHPOINT_ASSERT(0); /* Programming mistake if it gets this far */
-    return EXIT_SUCCESS;
+    return 0;
   }
 
   /* NOTREACHED */