X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=clients%2Fmemerror.cc;h=fd4238a51eb3dd256fa6530510d9605c12d1aceb;hb=3c74b93b3db239f4240c907a91678ed401fa41ad;hp=c30dd2e9d9f69ab307d05b98672f4da95150082b;hpb=ae6bc7501efd5aeaaee92dabe2da0ec2d1625c5b;p=awesomized%2Flibmemcached

diff --git a/clients/memerror.cc b/clients/memerror.cc
index c30dd2e9..fd4238a5 100644
--- a/clients/memerror.cc
+++ b/clients/memerror.cc
@@ -10,12 +10,14 @@
  */
 #include "config.h"
 
-#include <stdio.h>
 #include <inttypes.h>
-#include <string.h>
-#include <unistd.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <getopt.h>
-#include <stdlib.h>
+#include <iostream>
+#include <unistd.h>
+
 #include <libmemcached/memcached.h>
 
 #include "utilities.h"
@@ -31,21 +33,22 @@ static int opt_verbose= 0;
 
 int main(int argc, char *argv[])
 {
-  unsigned long value;
   options_parse(argc, argv);
 
   if (argc != 2)
+  {
     return EXIT_FAILURE;
+  }
 
-  value= strtoul(argv[1], (char **) NULL, 10);
+  unsigned long value= strtoul(argv[1], (char **) NULL, 10);
 
   if (value < MEMCACHED_MAXIMUM_RETURN)
   {
-    printf("%s\n", memcached_strerror(NULL, (memcached_return_t)value));
+    std::cout << memcached_strerror(NULL, (memcached_return_t)value) << std::endl;
   }
   else
   {
-    fprintf(stderr, "Unknown Error Code\n");
+    std::cerr << memcached_strerror(NULL, MEMCACHED_MAXIMUM_RETURN) << std::endl;
     return EXIT_FAILURE;
   }
 
@@ -55,48 +58,70 @@ int main(int argc, char *argv[])
 
 void options_parse(int argc, char *argv[])
 {
-  int option_index= 0;
-  int option_rv;
-
-  memcached_programs_help_st help_options[]=
-  {
-    {0},
-  };
-
   static struct option long_options[]=
     {
       {(OPTIONSTRING)"version", no_argument, NULL, OPT_VERSION},
       {(OPTIONSTRING)"help", no_argument, NULL, OPT_HELP},
+      {(OPTIONSTRING)"quiet", no_argument, NULL, OPT_QUIET},
       {(OPTIONSTRING)"verbose", no_argument, &opt_verbose, OPT_VERBOSE},
       {(OPTIONSTRING)"debug", no_argument, &opt_verbose, OPT_DEBUG},
       {0, 0, 0, 0},
     };
 
+  bool opt_version= false;
+  bool opt_help= false;
+  int option_index= 0;
   while (1) 
   {
-    option_rv= getopt_long(argc, argv, "Vhvds:", long_options, &option_index);
-    if (option_rv == -1) break;
+    int option_rv= getopt_long(argc, argv, "Vhvds:", long_options, &option_index);
+    if (option_rv == -1)
+    {
+      break;
+    }
+
     switch (option_rv)
     {
     case 0:
       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_VERSION: /* --version or -V */
-      version_command(PROGRAM_NAME);
+      opt_version= true;
       break;
+
     case OPT_HELP: /* --help or -h */
-      help_command(PROGRAM_NAME, PROGRAM_DESCRIPTION, long_options, help_options);
+      opt_help= true;
       break;
+
+    case OPT_QUIET:
+      close_stdio();
+      break;
+
     case '?':
       /* getopt_long already printed an error message. */
-      exit(1);
+      exit(EXIT_FAILURE);
+
     default:
       abort();
     }
   }
+
+  if (opt_version)
+  {
+    version_command(PROGRAM_NAME);
+    exit(EXIT_SUCCESS);
+  }
+
+  if (opt_help)
+  {
+    help_command(PROGRAM_NAME, PROGRAM_DESCRIPTION, long_options, NULL);
+    exit(EXIT_SUCCESS);
+  }
 }