Flip call (NULL is more common). Also add in helgrind and fix calloc.

[awesomized/libmemcached] / clients / utilities.c

diff --git a/clients/utilities.c b/clients/utilities.c
index d19f57ec8914d8a7c99cdd21131673692d2b343d..b9795246539156792616a4824658417d2aaa95f9 100644 (file)
--- a/clients/utilities.c
+++ b/clients/utilities.c
@@ -1,3 +1,4 @@
+#include "libmemcached/common.h"
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
@@ -21,7 +22,7 @@ void version_command(char *command_name)
   exit(0);
 }
 
-char *lookup_help(memcached_options option)
+static char *lookup_help(memcached_options option)
 {
   switch (option)
   {
@@ -37,12 +38,15 @@ char *lookup_help(memcached_options option)
   case OPT_ADD: return("Use add command with memcached when storing.");
   case OPT_SLAP_EXECUTE_NUMBER: return("Number of times to execute the given test.");
   case OPT_SLAP_INITIAL_LOAD: return("Number of key pairs to load before executing tests.");
-  case OPT_SLAP_TEST: return("Test to run.");
+  case OPT_SLAP_TEST: return("Test to run (currently \"get\" or \"set\").");
   case OPT_SLAP_CONCURRENCY: return("Number of users to simulate with load.");
   case OPT_SLAP_NON_BLOCK: return("Set TCP up to use non-blocking IO.");
   case OPT_SLAP_TCP_NODELAY: return("Set TCP socket up to use nodelay.");
   case OPT_FLUSH: return("Flush servers before running tests.");
   case OPT_HASH: return("Select hash type.");
+  case OPT_BINARY: return("Switch to binary protocol.");
+  case OPT_ANALYZE: return("Analyze the provided servers.");
+  case OPT_UDP: return("Use UDP protocol when communicating with server.");
   };
 
   WATCHPOINT_ASSERT(0);
@@ -51,7 +55,7 @@ char *lookup_help(memcached_options option)
 
 void help_command(char *command_name, char *description,
                   const struct option *long_options,
-                  memcached_programs_help_st *options)
+                  memcached_programs_help_st *options __attribute__((unused)))
 {
   unsigned int x;
 
@@ -92,8 +96,6 @@ void process_hash_option(memcached_st *memc, char *opt_hash)
     set= MEMCACHED_HASH_FNV1_32;
   else if (!strcasecmp(opt_hash, "FNV1A_32"))
     set= MEMCACHED_HASH_FNV1A_32;
-  else if (!strcasecmp(opt_hash, "KETAMA"))
-    set= MEMCACHED_HASH_KETAMA;
   else
   {
     fprintf(stderr, "hash: type not recognized %s\n", opt_hash);