Cleanup from memaslap

[awesomized/libmemcached] / clients / memcp.c

diff --git a/clients/memcp.c b/clients/memcp.c
index 5b0518e7caa63b4c94d0efb4a79794391f2519db..bf3828ae544ba64476a36887c101c9f8fa41873d 100644 (file)
--- a/clients/memcp.c
+++ b/clients/memcp.c
@@ -63,13 +63,13 @@ static long strtol_wrapper(const char *nptr, int base, bool *error)
       || (errno != 0 && val == 0))
   {
     *error= true;
-    return 0;
+    return EXIT_SUCCESS;
   }
 
   if (endptr == nptr)
   {
     *error= true;
-    return 0;
+    return EXIT_SUCCESS;
   }
 
   *error= false;
@@ -117,7 +117,7 @@ int main(int argc, char *argv[])
   if (!initialize_sasl(memc, opt_username, opt_passwd))
   {
     memcached_free(memc);
-    return 1;
+    return EXIT_FAILURE;
   }
 
   while (optind < argc)
@@ -188,8 +188,8 @@ int main(int argc, char *argv[])
     {
       fprintf(stderr, "memcp: %s: memcache error %s",
              ptr, memcached_strerror(memc, rc));
-      if (memc->cached_errno)
-       fprintf(stderr, " system error %s", strerror(memc->cached_errno));
+      if (memcached_last_error_errno(memc))
+       fprintf(stderr, " system error %s", strerror(memcached_last_error_errno(memc)));
       fprintf(stderr, "\n");
 
       return_code= -1;