Fixing broken memstat application

[m6w6/libmemcached] / src / memstat.c

diff --git a/src/memstat.c b/src/memstat.c
index a82f3f123d176ecde20f16f1df2a40f436600abd..0d7bef07af3f694ba5d85730e65e6a7e13f0ad71 100644 (file)
--- a/src/memstat.c
+++ b/src/memstat.c
@@ -11,6 +11,9 @@
 #include "client_options.h"
 #include "utilities.h"
 
+#define PROGRAM_NAME "memstat"
+#define PROGRAM_DESCRIPTION "Output the state of a memcached cluster."
+
 /* Prototypes */
 void options_parse(int argc, char *argv[]);
 
@@ -32,7 +35,7 @@ int main(int argc, char *argv[])
   if (!opt_servers)
     return 0;
 
-  memc= memcached_init(NULL);
+  memc= memcached_create(NULL);
 
   servers= parse_opt_servers(opt_servers);
   memcached_server_push(memc, servers);
@@ -40,7 +43,7 @@ int main(int argc, char *argv[])
 
   stat= memcached_stat(memc, NULL, &rc);
 
-  if (rc != MEMCACHED_SUCCESS || rc != MEMCACHED_SOME_ERRORS);
+  if (rc != MEMCACHED_SUCCESS && rc == MEMCACHED_SOME_ERRORS)
   {
     printf("Failure to communicate with servers (%s)\n",
           memcached_strerror(memc, rc));
@@ -77,13 +80,18 @@ int main(int argc, char *argv[])
   free(stat);
   free(opt_servers);
 
-  memcached_deinit(memc);
+  memcached_free(memc);
 
   return 0;
 }
 
 void options_parse(int argc, char *argv[])
 {
+  memcached_programs_help_st help_options[]=
+  {
+    {0},
+  };
+
   static struct option long_options[]=
   {
     {"version", no_argument, NULL, OPT_VERSION},
@@ -113,12 +121,10 @@ void options_parse(int argc, char *argv[])
       opt_verbose = OPT_DEBUG;
       break;
     case OPT_VERSION: /* --version or -V */
-      printf("memcache tools, memcat, v1.0\n");
-      exit(0);
+      version_command(PROGRAM_NAME);
       break;
     case OPT_HELP: /* --help or -h */
-      printf("useful help messages go here\n");
-      exit(0);
+      help_command(PROGRAM_NAME, PROGRAM_DESCRIPTION, long_options, help_options);
       break;
     case OPT_SERVERS: /* --servers or -s */
       opt_servers= strdup(optarg);