Found bug in multi get where key size was not being calculated.

[m6w6/libmemcached] / src / utilities.c

diff --git a/src/utilities.c b/src/utilities.c
index 5dd66f62731d871651d16eb7a5232bc39797a006..e6db318b2456bd18dab47017d9ef28ff261b7136 100644 (file)
--- a/src/utilities.c
+++ b/src/utilities.c
@@ -1,47 +1,38 @@
-#include <memcached.h>
+#include <ctype.h>
+#include <strings.h>
+#include "utilities.h"
 
-void parse_opt_servers(memcached_st *memc,
-                       char *opt_servers)
+long int timedif(struct timeval a, struct timeval b)
 {
-  char *string;
-  unsigned int port;
-  char *begin_ptr;
+  register int us, s;
 
-  for (begin_ptr= opt_servers, string= index(opt_servers, ','); 
-       begin_ptr[0]; 
-       begin_ptr= ++string, string= index(begin_ptr, ','))
-  {
-    char buffer[HUGE_STRING_LEN];
-    char *ptr;
-
-    memset(buffer, 0, HUGE_STRING_LEN);
-    if (string)
-    {
-      memcpy(buffer, begin_ptr, string - begin_ptr);
-    }
-    else
-    {
-      size_t length= strlen(opt_servers);
-      memcpy(buffer, begin_ptr, length);
-      string= opt_servers+length;
-    }
+  us = a.tv_usec - b.tv_usec;
+  us /= 1000;
+  s = a.tv_sec - b.tv_sec;
+  s *= 1000;
+  return s + us;
+}
 
-    ptr= index(buffer, ':');
+void version_command(char *command_name)
+{
+  printf("%s v%u.%u\n", command_name, 1, 0);
+  exit(0);
+}
 
-    if (ptr)
-    {
-      ptr[0]= 0;
+void help_command(char *command_name, char *description,
+                  const struct option *long_options,
+                  memcached_programs_help_st *options)
+{
+  unsigned int x;
 
-      ptr++;
+  printf("%s v%u.%u\n\n", command_name, 1, 0);
+  printf("\t%s\n\n", description);
+  printf("Current options. A '=' means the option takes a value.\n\n");
 
-      port= strtol(ptr, (char **)NULL, 10);
+  for (x= 0; long_options[x].name; x++) 
+    printf("\t --%s%c\n", long_options[x].name, 
+           long_options[x].has_arg ? '=' : ' ');  
 
-      memcached_server_add(memc, buffer, port);
-    }
-    else
-    {
-      memcached_server_add(memc, buffer, 0);
-    }
-  }
+  printf("\n");
+  exit(0);
 }
-