Convert storage over to use vector better.

[awesomized/libmemcached] / clients / memcp.cc

diff --git a/clients/memcp.cc b/clients/memcp.cc
index 4f4f8e1097243ac10e4a754ae244a3ae54dca6f7..384622139e2990c008c4bb52db88c95186d8d2c2 100644 (file)
--- a/clients/memcp.cc
+++ b/clients/memcp.cc
@@ -61,8 +61,8 @@ static long strtol_wrapper(const char *nptr, int base, bool *error)
 
   /* Check for various possible errors */
 
-  if ((errno == ERANGE && (val == LONG_MAX || val == LONG_MIN))
-      || (errno != 0 && val == 0))
+  if ((errno == ERANGE and (val == LONG_MAX or val == LONG_MIN))
+      or (errno != 0 && val == 0))
   {
     *error= true;
     return EXIT_SUCCESS;
@@ -143,7 +143,7 @@ int main(int argc, char *argv[])
     {
       if (opt_verbose)
       {
-        fprintf(stderr, "memcp: %s: %s\n", argv[optind], strerror(errno));
+        std::cerr << "memcp " << argv[optind] << " " << strerror(errno) << std::endl;
         optind++;
       }
       exit_code= EXIT_FAILURE;
@@ -175,45 +175,46 @@ int main(int argc, char *argv[])
     char *file_buffer_ptr;
     if ((file_buffer_ptr= (char *)malloc(sizeof(char) * (size_t)sbuf.st_size)) == NULL)
     {
-      fprintf(stderr, "malloc: %s\n", strerror(errno));
+      std::cerr << "Error allocating file buffer(" << strerror(errno) << ")" << std::endl;
       exit(EXIT_FAILURE);
     }
 
     ssize_t read_length;
     if ((read_length= read(fd, file_buffer_ptr, (size_t)sbuf.st_size)) == -1)
     {
-      fprintf(stderr, "read: %s\n", strerror(errno));
+      std::cerr << "Error while reading file " << file_buffer_ptr << " (" << strerror(errno) << ")" << std::endl;
       exit(EXIT_FAILURE);
     }
 
     if (read_length != sbuf.st_size)
     {
-      fprintf(stderr, "Failure reading from file\n");
-      exit(1);
+      std::cerr << "Failure while reading file. Read length was not equal to stat() length" << std::endl;
+      exit(EXIT_FAILURE);
     }
 
     memcached_return_t rc;
     if (opt_method == OPT_ADD)
+    {
       rc= memcached_add(memc, ptr, strlen(ptr),
                         file_buffer_ptr, (size_t)sbuf.st_size,
                        opt_expires, opt_flags);
+    }
     else if (opt_method == OPT_REPLACE)
+    {
       rc= memcached_replace(memc, ptr, strlen(ptr),
                            file_buffer_ptr, (size_t)sbuf.st_size,
                            opt_expires, opt_flags);
+    }
     else
+    {
       rc= memcached_set(memc, ptr, strlen(ptr),
                         file_buffer_ptr, (size_t)sbuf.st_size,
                         opt_expires, opt_flags);
+    }
 
     if (rc != MEMCACHED_SUCCESS)
     {
-      fprintf(stderr, "memcp: %s: memcache error %s",
-             ptr, memcached_strerror(memc, rc));
-      if (memcached_last_error_errno(memc))
-       fprintf(stderr, " system error %s", strerror(memcached_last_error_errno(memc)));
-      fprintf(stderr, "\n");
-
+      std::cerr << "Error occrrured during operation: " << memcached_last_error_message(memc) << std::endl;
       exit_code= EXIT_FAILURE;
     }
 
@@ -225,9 +226,14 @@ int main(int argc, char *argv[])
   memcached_free(memc);
 
   if (opt_servers)
+  {
     free(opt_servers);
+  }
+
   if (opt_hash)
+  {
     free(opt_hash);
+  }
 
   return exit_code;
 }
@@ -274,6 +280,7 @@ static void options_parse(int argc, char *argv[])
     {
     case 0:
       break;
+
     case OPT_BINARY:
       opt_binary= true;
       break;