X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fmemrm.c;h=2df86838ace4cad0d77437868bdacbabf971357e;hb=8996c21d87b51d6bcc72efd93cbf83cc559498a5;hp=e07654f3cad4a7968c5c90ec3fcf97f0dfffe0c4;hpb=113160884d25c401dc352cfab093b5b7b1a4fde0;p=m6w6%2Flibmemcached

diff --git a/src/memrm.c b/src/memrm.c
index e07654f3..2df86838 100644
--- a/src/memrm.c
+++ b/src/memrm.c
@@ -9,6 +9,9 @@ static int opt_verbose= 0;
 static time_t opt_expire= 0;
 static char *opt_servers= NULL;
 
+#define PROGRAM_NAME "memrm"
+#define PROGRAM_DESCRIPTION "Erase a key or set of keys from a memcached cluster."
+
 /* Prototypes */
 void options_parse(int argc, char *argv[]);
 
@@ -23,7 +26,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);
@@ -44,7 +47,7 @@ int main(int argc, char *argv[])
     optind++;
   }
 
-  memcached_deinit(memc);
+  memcached_free(memc);
 
   free(opt_servers);
 
@@ -54,6 +57,11 @@ int main(int argc, char *argv[])
 
 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},
@@ -82,12 +90,10 @@ void options_parse(int argc, char *argv[])
       opt_verbose = OPT_DEBUG;
       break;
     case OPT_VERSION: /* --version or -V */
-      printf("memcache tools, memrm, 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);