X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fbin%2Fmemcp.cc;h=8ab28928beb2a7a23ae44d41377675d69b7bfbfc;hb=f2ab0a0c16503c35c23c6ad1ba11913d054ccdad;hp=c0815daca77bcfab69efa4e909430a429ecf521f;hpb=7c2da91b9897c54f66e7fc634a675fcaeef32167;p=awesomized%2Flibmemcached

diff --git a/src/bin/memcp.cc b/src/bin/memcp.cc
index c0815dac..8ab28928 100644
--- a/src/bin/memcp.cc
+++ b/src/bin/memcp.cc
@@ -62,7 +62,7 @@ static long strtol_wrapper(const char *nptr, int base, bool *error) {
 
   /* Check for various possible errors */
 
-  if ((errno == ERANGE and (val == LONG_MAX or val == LONG_MIN)) or (errno != 0 && val == 0)) {
+  if ((errno == ERANGE and (val == LONG_MAX or val == LONG_MIN)) or (errno && val == 0)) {
     *error = true;
     return 0;
   }
@@ -296,19 +296,32 @@ static void options_parse(int argc, char *argv[]) {
       break;
 
     switch (option_rv) {
-    case 0: break;
+    case 0:
+      break;
 
-    case OPT_BINARY: opt_binary = true; break;
+    case OPT_BINARY:
+      opt_binary = true;
+      break;
 
-    case OPT_VERBOSE: /* --verbose or -v */ opt_verbose = OPT_VERBOSE; break;
+    case OPT_VERBOSE: /* --verbose or -v */
+      opt_verbose = OPT_VERBOSE;
+      break;
 
-    case OPT_DEBUG: /* --debug or -d */ opt_verbose = OPT_DEBUG; break;
+    case OPT_DEBUG: /* --debug or -d */
+      opt_verbose = OPT_DEBUG;
+      break;
 
-    case OPT_VERSION: /* --version or -V */ opt_version = true; break;
+    case OPT_VERSION: /* --version or -V */
+      opt_version = true;
+      break;
 
-    case OPT_HELP: /* --help or -h */ opt_help = true; break;
+    case OPT_HELP: /* --help or -h */
+      opt_help = true;
+      break;
 
-    case OPT_SERVERS: /* --servers or -s */ opt_servers = strdup(optarg); break;
+    case OPT_SERVERS: /* --servers or -s */
+      opt_servers = strdup(optarg);
+      break;
 
     case OPT_FLAG: /* --flag */
     {
@@ -330,28 +343,47 @@ static void options_parse(int argc, char *argv[]) {
       }
     } break;
 
-    case OPT_SET: opt_method = OPT_SET; break;
+    case OPT_SET:
+      opt_method = OPT_SET;
+      break;
 
-    case OPT_REPLACE: opt_method = OPT_REPLACE; break;
+    case OPT_REPLACE:
+      opt_method = OPT_REPLACE;
+      break;
 
-    case OPT_ADD: opt_method = OPT_ADD; break;
+    case OPT_ADD:
+      opt_method = OPT_ADD;
+      break;
 
-    case OPT_HASH: opt_hash = strdup(optarg); break;
+    case OPT_HASH:
+      opt_hash = strdup(optarg);
+      break;
 
-    case OPT_USERNAME: opt_username = optarg; break;
+    case OPT_USERNAME:
+      opt_username = optarg;
+      break;
 
-    case OPT_PASSWD: opt_passwd = optarg; break;
+    case OPT_PASSWD:
+      opt_passwd = optarg;
+      break;
 
-    case OPT_QUIET: close_stdio(); break;
+    case OPT_QUIET:
+      close_stdio();
+      break;
 
-    case OPT_UDP: opt_udp = true; break;
+    case OPT_UDP:
+      opt_udp = true;
+      break;
 
-    case OPT_BUFFER: opt_buffer = true; break;
+    case OPT_BUFFER:
+      opt_buffer = true;
+      break;
 
     case '?':
       /* getopt_long already printed an error message. */
       exit(1);
-    default: abort();
+    default:
+      abort();
     }
   }