Fixed all warnings in code.

diff --cc lib/Makefile.am
index b9072cf2843070757de91234ef920b6cd6b42600,b9072cf2843070757de91234ef920b6cd6b42600..93ab95edcc26e2f154ec28952f08e3c337e52b11
--- 1/lib/Makefile.am
--- 2/lib/Makefile.am
+++ b/lib/Makefile.am
@@@ -1,4 -1,4 +1,4 @@@
--INCLUDES = -I$(top_builddir)/include\r
++INCLUDES = -I$(top_builddir)/include -Wall\r
  LIBS =\r
  \r
  lib_LTLIBRARIES = libmemcached.la\r

diff --cc lib/memcached.c
index 6a7715de06cfac8251c7d56a049a1bc5717cb525,6a7715de06cfac8251c7d56a049a1bc5717cb525..8122e1e837876156fe8dc5d4a192d5fdadb26d7e
--- 1/lib/memcached.c
--- 2/lib/memcached.c
+++ b/lib/memcached.c
@@@ -26,7 -26,7 +26,6 @@@ memcached_st *memcached_init(memcached_
  void memcached_deinit(memcached_st *ptr)
  {
    unsigned int x;
--  memcached_host_st *host_ptr;
  
    if (ptr->hosts)
    {

diff --cc lib/memcached_auto.c
index 975be824ac5c4afcefdfd313d6c6eabbb99fa459,268f95b8b5b6474c4a5505f56c62233fe7b88a45..7122dc90096e6db4659dfc2120d0e32660e6085a
--- 1/lib/memcached_auto.c
--- 2/lib/memcached_auto.c
+++ b/lib/memcached_auto.c
@@@ -20,15 -20,15 +20,11 @@@ static memcached_return memcached_auto(
  
    send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, 
                          "%s %.*s %u\r\n", verb, 
--                        key_length, key,
++                        (int)key_length, key,
                          offset);
  
 -  if ((send(ptr->hosts[server_key].fd, buffer, send_length, 0) == -1))
 -  {
 -    fprintf(stderr, "failed set on %.*s TCP\n", key_length+1, key);
 -
 +  if ((write(ptr->hosts[server_key].fd, buffer, send_length) == -1))
-   {
-     fprintf(stderr, "failed set on %.*s TCP\n", key_length+1, key);
- 
      return MEMCACHED_WRITE_FAILURE;
--  }
  
    memset(buffer, 0, MEMCACHED_DEFAULT_COMMAND_SIZE);
    send_length= read(ptr->hosts[server_key].fd, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE);

diff --cc lib/memcached_connect.c
index d015c68a2ccf7b42c1d5f05411733afa99d6f001,592ede44e804e4dad5b0511f37927b0d1c3d746a..a0c8737c31df48e6e6b7b98e5549d06344408e42
--- 1/lib/memcached_connect.c
--- 2/lib/memcached_connect.c
+++ b/lib/memcached_connect.c
@@@ -26,7 -27,7 +26,6 @@@ memcached_return memcached_connect(memc
    unsigned int x;
    struct sockaddr_in localAddr, servAddr;
    struct hostent *h;
--  memcached_host_st *host_ptr;
  
    if (ptr->connected)
      return MEMCACHED_SUCCESS;
@@@ -44,10 -45,10 +43,7 @@@
    for (x= 0; x < ptr->number_of_hosts; x++)
    {
      if ((h= gethostbyname(ptr->hosts[x].hostname)) == NULL)
--    {
--      fprintf(stderr, "unknown host '%s'\n", ptr->hosts[x].hostname);
        return MEMCACHED_HOST_LOCKUP_FAILURE;
--    }
  
      servAddr.sin_family= h->h_addrtype;
      memcpy((char *) &servAddr.sin_addr.s_addr, h->h_addr_list[0], h->h_length);
@@@ -55,10 -56,10 +51,7 @@@
  
      /* Create the socket */
      if ((ptr->hosts[0].fd= socket(AF_INET, SOCK_STREAM, 0)) < 0)
--    {
--      fprintf(stderr, "cannot open socket");
        return MEMCACHED_CONNECTION_SOCKET_CREATE_FAILURE;
--    }
  
  
      /* bind any port number */
@@@ -67,19 -68,19 +60,11 @@@
      localAddr.sin_port = htons(0);
  
      if (bind(ptr->hosts[0].fd, (struct sockaddr *) &localAddr, sizeof(localAddr)) < 0)
--    {
--      fprintf(stderr, "cannot bind port TCP %u\n", ptr->hosts[x].port);
        return(MEMCACHED_CONNECTION_BIND_FAILURE);
--    }
  
      /* connect to server */
      if (connect(ptr->hosts[0].fd, (struct sockaddr *) &servAddr, sizeof(servAddr)) < 0)
--    {
--      fprintf(stderr, "cannot connect to host '%s' (%u)  (error: %s)\n", ptr->hosts[x].hostname, 
--              ptr->hosts[x].port,
--              strerror(errno));
        return MEMCACHED_HOST_LOCKUP_FAILURE;
--    }
    }
  
    ptr->connected= 1;

diff --cc lib/memcached_delete.c
index e601e6fa969fca32cbb4a6e9c879edb6215cec75,e601e6fa969fca32cbb4a6e9c879edb6215cec75..d24c0f82a0b7d16ffff58e922a09a05f97817010
--- 1/lib/memcached_delete.c
--- 2/lib/memcached_delete.c
+++ b/lib/memcached_delete.c
@@@ -17,16 -17,16 +17,14 @@@ memcached_return memcached_delete(memca
  
    if (expiration)
      send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, 
--                          "delete %.*s %u\r\n", key_length, key, expiration);
++                          "delete %.*s %llu\r\n", (int)key_length, key, 
++                          (unsigned long long)expiration);
    else
      send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, 
--                          "delete %.*s\r\n", key_length, key);
--  if ((write(ptr->hosts[server_key].fd, buffer, send_length) == -1))
--  {
--    fprintf(stderr, "failed set on %.*s TCP\n", key_length+1, key);
++                          "delete %.*s\r\n", (int)key_length, key);
  
++  if ((write(ptr->hosts[server_key].fd, buffer, send_length) == -1))
      return MEMCACHED_WRITE_FAILURE;
--  }
  
    return memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, server_key);
  }

diff --cc lib/memcached_flush.c
index a3e1be0b191250810f906b83411a1b77c8ebb941,f7527a7c31eb42ebfc3070ea0118ab3a70e2f745..8c51cdf1f85f8e9e44d3fa7a67fb673aac42aa52
--- 1/lib/memcached_flush.c
--- 2/lib/memcached_flush.c
+++ b/lib/memcached_flush.c
@@@ -16,16 -16,16 +16,12 @@@ memcached_return memcached_flush(memcac
    {
      if (expiration)
        send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, 
--                            "flush_all %u\r\n", expiration);
++                            "flush_all %llu\r\n", (unsigned long long)expiration);
      else
        send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, 
                              "flush_all\r\n");
 -    if ((send(ptr->hosts[x].fd, buffer, send_length, 0) == -1))
 -    {
 -      fprintf(stderr, "failed flush_all TCP\n");
 -
 +    if ((write(ptr->hosts[x].fd, buffer, send_length) == -1))
-     {
-       fprintf(stderr, "failed flush_all TCP\n");
- 
        return MEMCACHED_WRITE_FAILURE;
--    }
  
      rc= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, x);
  

diff --cc lib/memcached_get.c
index 36d965052f750c4fd16d1a55702340ecdb7ed932,c688af34639684f8931d54c00e5db1b4a9c19946..a18854506d4743b9fb7d404786adbd16434c34e1
--- 1/lib/memcached_get.c
--- 2/lib/memcached_get.c
+++ b/lib/memcached_get.c
@@@ -19,13 -19,13 +19,12 @@@ char *memcached_get(memcached_st *ptr, 
    server_key= memcached_generate_hash(key, key_length) % ptr->number_of_hosts;
  
    send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, "get %.*s\r\n", 
--                        key_length, key);
++                        (int)key_length, key);
    if (*error != MEMCACHED_SUCCESS)
      return NULL;
  
 -  if ((send(ptr->hosts[server_key].fd, buffer, send_length, 0) == -1))
 +  if ((write(ptr->hosts[server_key].fd, buffer, send_length) == -1))
    {
--    fprintf(stderr, "failed fetch on %.*s TCP\n", key_length+1, key);
      *error= MEMCACHED_WRITE_FAILURE;
      return NULL;
    }

diff --cc lib/memcached_stats.c
index 8928ee0909ec06bbba9ab23be4486d86fb2d948b,2511532c26f7db2754cf1081ebc221980acb0517..d7f948faad31c99ec4999b110c987982e750367f
--- 1/lib/memcached_stats.c
--- 2/lib/memcached_stats.c
+++ b/lib/memcached_stats.c
@@@ -207,9 -207,9 +207,7 @@@ memcached_stat_st *memcached_stat(memca
  memcached_return memcached_stat_hostname(memcached_stat_st *stat, char *args, 
                                           char *hostname, unsigned int port)
  {
--  size_t send_length;
    memcached_return rc;
--  char buffer[HUGE_STRING_LEN];
    memcached_st memc;
  
    memcached_init(&memc);

diff --cc lib/memcached_storage.c
index 5c34a57347dfd6854e418263cd7464d2954d8775,3df4913ad10fb23cb06d9b61a9c0ef4246bd3ec6..484341c842c286ad2dd8fd106cc5ebfe328f70e7
--- 1/lib/memcached_storage.c
--- 2/lib/memcached_storage.c
+++ b/lib/memcached_storage.c
@@@ -31,40 -28,31 +31,27 @@@ static memcached_return memcached_send(
  
    server_key= memcached_generate_hash(key, key_length) % ptr->number_of_hosts;
  
 -  send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, 
 -                        "%s %.*s %u %u %u\r\n", verb,
 -                        key_length, key, flags, expiration, value_length);
 -  if ((send(ptr->hosts[server_key].fd, buffer, send_length, 0) == -1))
 -  {
 -    fprintf(stderr, "failed set on %.*s TCP\n", key_length+1, key);
 -
 +  write_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, 
-                         "%s %.*s %u %u %u\r\n", verb,
-                         key_length, key, flags, expiration, value_length);
++                        "%s %.*s %x %llu %zu\r\n", verb,
++                        (int)key_length, key, flags, 
++                        (unsigned long long)expiration, value_length);
 +  if ((sent_length= write(ptr->hosts[server_key].fd, buffer, write_length)) == -1)
-   {
-     fprintf(stderr, "failed %s on %.*s: %s\n", verb, key_length+1, key, strerror(errno));
- 
      return MEMCACHED_WRITE_FAILURE;
--  }
 +  assert(write_length == sent_length);
  
-   WATCHPOINT;
-   printf("About to push %.*s\n", value_length, value);
-   WATCHPOINT;
 -  send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, 
 -                        "%.*s\r\n", 
 -                        value_length, value);
 -  if ((send(ptr->hosts[server_key].fd, buffer, send_length, 0) == -1))
 -  {
 -    fprintf(stderr, "failed set on %.*s TCP\n", key_length+1, key);
 +  if ((sent_length= write(ptr->hosts[server_key].fd, value, value_length)) == -1)
-   {
-     fprintf(stderr, "failed %s on %.*s: %s\n", verb, key_length+1, key, strerror(errno));
- 
 +    return MEMCACHED_WRITE_FAILURE;
-   }
 +  assert(value_length == sent_length);
-   if ((sent_length= write(ptr->hosts[server_key].fd, "\r\n", 2)) == -1)
-   {
-     fprintf(stderr, "failed %s on %.*s: %s\n", verb, key_length+1, key, strerror(errno));
  
++  if ((sent_length= write(ptr->hosts[server_key].fd, "\r\n", 2)) == -1)
      return MEMCACHED_WRITE_FAILURE;
--  }
 -  
 -  send_length= read(ptr->hosts[server_key].fd, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE);
 +  assert(2 == sent_length);
 +
 +  sent_length= read(ptr->hosts[server_key].fd, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE);
  
 -  if (send_length && buffer[0] == 'S')  /* STORED */
 +  if (sent_length && buffer[0] == 'S')  /* STORED */
      return MEMCACHED_SUCCESS;
 -  else if (send_length && buffer[0] == 'N')  /* NOT_STORED */
 +  else if (write_length && buffer[0] == 'N')  /* NOT_STORED */
      return MEMCACHED_NOTSTORED;
    else
      return MEMCACHED_READ_FAILURE;

diff --cc lib/memcached_strerror.c
index f6d9105ec2958a6bded17bada4dda05505fbe7d2,f6d9105ec2958a6bded17bada4dda05505fbe7d2..335ec26c83dd19dd9e0ddf2815963b2870f8cba7
--- 1/lib/memcached_strerror.c
--- 2/lib/memcached_strerror.c
+++ b/lib/memcached_strerror.c
@@@ -41,6 -41,6 +41,8 @@@ char *memcached_strerror(memcached_st *
    case MEMCACHED_PARTIAL_READ:
      return "PARTIAL READ";
    case MEMCACHED_SOME_ERRORS:
--    return "SOME ERRORS WERE REPORTED ";
++    return "SOME ERRORS WERE REPORTED";
    };
++
++  return "COMPLETELY UNKNOWN ERROR, SOMEONE FORGOT TO UPDATE ERROR MESSAGES";
  }

diff --cc lib/memcached_verbosity.c
index bb4f68c06ecd13c2fd1ada0681a0b743fdb1a0c7,4e586cfb7b7b219410b9ee7d35929f5ba300213a..506dbb07a6f5760a663f7d849e785fed7deaff97
--- 1/lib/memcached_verbosity.c
--- 2/lib/memcached_verbosity.c
+++ b/lib/memcached_verbosity.c
@@@ -19,12 -19,12 +19,8 @@@ memcached_return memcached_verbosity(me
    {
      memcached_return rc;
  
 -    if ((send(ptr->hosts[x].fd, buffer, send_length, 0) == -1))
 -    {
 -      fprintf(stderr, "failed verbosity\n");
 -
 +    if ((write(ptr->hosts[x].fd, buffer, send_length) == -1))
-     {
-       fprintf(stderr, "failed verbosity\n");
- 
        return MEMCACHED_WRITE_FAILURE;
--    }
  
      rc= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, x);
  

diff --cc src/Makefile.am
index 3f003d7c6e25a4758b3cd4e7773b3b971216d496,3f003d7c6e25a4758b3cd4e7773b3b971216d496..57386faee3b6cf2fd54a2e010f1add5f35cac5ea
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -1,4 -1,4 +1,4 @@@
--INCLUDES = -I$(top_builddir)/include\r
++INCLUDES = -I$(top_builddir)/include -Wall\r
  LDADDS = ../lib/libmemcached.la\r
  \r
  bin_PROGRAMS = memcat memcp memstat memrm\r

diff --cc src/memcat.c
index 4253aa00fc2663e0a4ab6804f9eb7f9d100f93c7,ed540abb0c54b7eadcd0eabb2e869e4fdb4af39f..1e7f5bf7821131aa1c63c371dc46c6caa53d7332
--- 1/src/memcat.c
--- 2/src/memcat.c
+++ b/src/memcat.c
@@@ -10,8 -10,8 +10,8 @@@
  /* Prototypes */\r
  void options_parse(int argc, char *argv[]);\r
  \r
--static int opt_verbose;\r
--static int opt_displayflag;\r
++static int opt_verbose= 0;\r
++static int opt_displayflag= 0;\r
  static char *opt_servers;\r
  \r
  int main(int argc, char *argv[])\r
@@@ -37,29 -36,29 +37,31 @@@
      {\r
        if (opt_displayflag)\r
        {\r
--      if (opt_verbose)\r
--        printf("key: %s\nflags: ", argv[optind]);\r
-       printf("%u\n", flags);\r
 -      printf("%x\n", flags);\r
++        if (opt_verbose)\r
++          printf("key: %s\nflags: ", argv[optind]);\r
++        printf("%x\n", flags);\r
        }\r
        else \r
        {\r
--      if (opt_verbose)\r
-         printf("key: %s\nflags: %u\nlength: %uz\nvalue: ",\r
 -        printf("key: %s\nflags: %x\nlength: %zu\nvalue: ",\r
--               argv[optind], flags, string_length);\r
--        printf("%.*s\n", string_length, string);\r
++        if (opt_verbose)\r
++          printf("key: %s\nflags: %x\nlength: %zu\nvalue: ",\r
++                 argv[optind], flags, string_length);\r
++        printf("%.*s\n", (int)string_length, string);\r
          free(string);\r
        }\r
      }\r
      else\r
      {\r
        fprintf(stderr, "memcat: %s: memcache error %s\n", \r
--            argv[optind], memcached_strerror(memc, rc));\r
++              argv[optind], memcached_strerror(memc, rc));\r
      }\r
      optind++;\r
    }\r
  \r
    memcached_deinit(memc);\r
  \r
++  free(opt_servers);\r
++\r
    return 0;\r
  };\r
  \r
@@@ -96,7 -96,7 +99,7 @@@ void options_parse(int argc, char *argv
        exit(0);\r
        break;\r
      case OPT_SERVERS: /* --servers or -s */\r
--      opt_servers= optarg;\r
++      opt_servers= strdup(optarg);\r
        break;\r
      case '?':\r
        /* getopt_long already printed an error message. */\r

diff --cc src/memcp.c
index bba346b973f047856fb1eff95df45e0f8ff177c9,3a76049a1429fbeb0dfcace4b13baa684157a9a7..ec9a2fafb12a2b1bf88389cb4c6d6585c7ef5b32
--- 1/src/memcp.c
--- 2/src/memcp.c
+++ b/src/memcp.c
@@@ -9,40 -10,37 +9,41 @@@
  \r
  #include <memcached.h>\r
  #include "client_options.h"\r
++#include "utilities.h"\r
  \r
  /* Prototypes */\r
  void options_parse(int argc, char *argv[]);\r
  \r
 -static int opt_verbose;\r
 -static char *opt_servers;\r
 -static int opt_replace;\r
 -uint16_t opt_flags= 0;\r
 -time_t opt_expires= 0;\r
 +static int opt_verbose= 0;\r
 +static char *opt_servers= NULL;\r
- static int opt_method= 0;\r
- uint16_t opt_flags= 0;\r
- time_t opt_expires= 0;\r
++static int opt_method= OPT_SET;\r
++static uint16_t opt_flags= 0;\r
++static time_t opt_expires= 0;\r
  \r
  int main(int argc, char *argv[])\r
  {\r
    memcached_st *memc;\r
--  char *string;\r
--  size_t string_length;\r
    memcached_return rc;\r
+ \r
    options_parse(argc, argv);\r
  \r
    memc= memcached_init(NULL);\r
 -  parse_opt_servers(memc, opt_servers);\r
+ \r
 -  while (optind <= argc) \r
 +  if (opt_servers)\r
 +    parse_opt_servers(memc, opt_servers);\r
 +  else\r
 +    parse_opt_servers(memc, argv[--argc]);\r
 +\r
 +  while (optind < argc) \r
    {\r
 -    char *mptr;\r
      struct stat sbuf;\r
      int fd;\r
      char *ptr;\r
 +    ssize_t read_length;\r
 +    char *file_buffer_ptr;\r
  \r
      fd= open(argv[optind], O_RDONLY);\r
-     if (fd < 0) \r
+     if (fd < 0)\r
      {\r
        fprintf(stderr, "memcp: %s: %s\n", argv[optind], strerror(errno));\r
        optind++;\r
@@@ -57,57 -63,45 +58,57 @@@
      else\r
        ptr= argv[optind];\r
  \r
 -    if (opt_verbose)\r
 +    if (opt_verbose) \r
      {\r
 -      static char *opstr[]= { "set", "add", "replace" };\r
 +      static char *opstr[] = { "set", "add", "replace" };\r
        printf("op: %s\nsource file: %s\nlength: %zu\n"\r
-            "key: %s\nflags: %u\n expires: %llu\n",\r
-            opstr[opt_method], argv[optind], sbuf.st_size,\r
 -           "key: %s\nflags: %x\n expires: %ld\n",\r
 -           opstr[opt_replace], argv[optind], sbuf.st_size,\r
--           ptr, opt_flags, opt_expires);\r
++           "key: %s\nflags: %x\n expires: %llu\n",\r
++           opstr[opt_method], argv[optind], (size_t)sbuf.st_size,\r
++           ptr, opt_flags, (unsigned long long)opt_expires);\r
      }\r
  \r
 -    if (opt_replace == 0)\r
 -      rc= memcached_set(memc, ptr, strlen(ptr),\r
 -                      mptr, sbuf.st_size,\r
 -                      opt_expires, opt_flags);\r
 -    else if (opt_replace == 1)\r
 +    if ((file_buffer_ptr= (char *)malloc(sizeof(char) * sbuf.st_size)) == NULL)\r
 +    {\r
 +      fprintf(stderr, "malloc: %s\n", strerror(errno)); \r
 +      exit(1);\r
 +    }\r
 +\r
 +    if ((read_length= read(fd, file_buffer_ptr, sbuf.st_size)) == -1)\r
 +    {\r
 +      fprintf(stderr, "read: %s\n", strerror(errno)); \r
 +      exit(1);\r
 +    }\r
 +    assert(read_length == sbuf.st_size);\r
 +\r
 +    if (opt_method == OPT_ADD)\r
        rc= memcached_add(memc, ptr, strlen(ptr),\r
 -                      mptr, sbuf.st_size,\r
 +                        file_buffer_ptr, sbuf.st_size,\r
                        opt_expires, opt_flags);\r
 -    else if (opt_replace == 2)\r
 +    else if (opt_method == OPT_REPLACE)\r
        rc= memcached_replace(memc, ptr, strlen(ptr),\r
 -                          mptr, sbuf.st_size,\r
 +                          file_buffer_ptr, sbuf.st_size,\r
                            opt_expires, opt_flags);\r
      else\r
 -      abort();\r
 +      rc= memcached_set(memc, ptr, strlen(ptr),\r
 +                        file_buffer_ptr, sbuf.st_size,\r
 +                        opt_expires, opt_flags);\r
  \r
      if (rc != MEMCACHED_SUCCESS)\r
 -    {\r
        fprintf(stderr, "memcp: %s: memcache error %s\n", \r
              ptr, memcached_strerror(memc, rc));\r
 -    }\r
  \r
 -    munmap(mptr, sbuf.st_size);\r
 +    WATCHPOINT;\r
 +    free(file_buffer_ptr);\r
      close(fd);\r
      optind++;\r
    }\r
  \r
    memcached_deinit(memc);\r
  \r
-   cleanup();\r
++  free(opt_servers);\r
 +\r
    return 0;\r
- };\r
+ }\r
  \r
  void options_parse(int argc, char *argv[])\r
  {\r
@@@ -145,22 -140,13 +147,22 @@@
        printf("useful help messages go here\n");\r
        exit(0);\r
      case OPT_SERVERS: /* --servers or -s */\r
-       opt_servers= strdup_cleanup(optarg);\r
 -      opt_servers= optarg;\r
++      opt_servers= strdup(optarg);\r
        break;\r
      case OPT_FLAG: /* --flag */\r
-       opt_flags= (uint16_t)strtol(optarg, (char **)NULL, 10);\r
+       opt_flags= (uint16_t)strtol(optarg, (char **)NULL, 16);\r
        break;\r
      case OPT_EXPIRE: /* --expire */\r
--      opt_expires= (time_t)strtol(optarg, (char **)NULL, 10);\r
++      opt_expires= (time_t)strtoll(optarg, (char **)NULL, 10);\r
 +      break;\r
 +    case OPT_SET:\r
 +      opt_method= OPT_SET;\r
 +      break;\r
 +    case OPT_REPLACE:\r
 +      opt_method= OPT_REPLACE;\r
 +      break;\r
 +    case OPT_ADD:\r
 +      opt_method= OPT_ADD;\r
        break;\r
      case '?':\r
        /* getopt_long already printed an error message. */\r

diff --cc src/memrm.c
index 4a3da0218b5032f4f1aaab4580d5cf6f2401dfbb,f49444e85f4219e6e1187b5a31bf68dd9822feb9..3e468a3d875d6619621386bc2a9d5c1505c5717c
--- 1/src/memrm.c
--- 2/src/memrm.c
+++ b/src/memrm.c
@@@ -3,29 -3,29 +3,65 @@@
  #include <getopt.h>\r
  #include <memcached.h>\r
  #include "client_options.h"\r
++#include "utilities.h"\r
  \r
--static int opt_verbose;\r
--static char *opt_servers;\r
++static int opt_verbose= 0;\r
++static time_t opt_expire= 0;\r
++static char *opt_servers= NULL;\r
++\r
++/* Prototypes */\r
++void options_parse(int argc, char *argv[]);\r
  \r
  int main(int argc, char *argv[])\r
  {\r
    memcached_st *memc;\r
--  char *string;\r
--  size_t string_length;\r
-   time_t expires = 0;\r
 -  time_t expires= 0;\r
    memcached_return rc;\r
  \r
-   static struct option long_options[] =\r
 -  static struct option long_options[]=\r
++  options_parse(argc, argv);\r
++\r
++  memc= memcached_init(NULL);\r
++\r
++  parse_opt_servers(memc, opt_servers);\r
++\r
++  if (opt_servers)\r
++    parse_opt_servers(memc, opt_servers);\r
++  \r
++  while (optind <= argc) \r
++  {\r
++    if (opt_verbose) \r
++      printf("key: %s\nexpires: %llu\n", argv[optind], (unsigned long long)opt_expire);\r
++    rc = memcached_delete(memc, argv[optind], strlen(argv[optind]), opt_expire);\r
++\r
++    if (rc != MEMCACHED_SUCCESS) \r
      {\r
--      {"version", no_argument, NULL, OPT_VERSION},\r
--      {"help", no_argument, NULL, OPT_HELP},\r
-       {"verbose", no_argument, &opt_verbose, OPT_VERBOSE},\r
-       {"debug", no_argument, &opt_verbose, OPT_DEBUG},\r
 -      {"verbose", no_argument, &opt_verbose, 1},\r
 -      {"debug", no_argument, &opt_verbose, 2},\r
--      {"servers", required_argument, NULL, OPT_SERVERS},\r
--      {"expire", required_argument, NULL, OPT_EXPIRE},\r
--      {0, 0, 0, 0},\r
--    };\r
-   int option_index = 0;\r
++      fprintf(stderr, "memrm: %s: memcache error %s\n", \r
++            argv[optind], memcached_strerror(memc, rc));\r
++    }\r
++\r
++    optind++;\r
++  }\r
++\r
++  memcached_deinit(memc);\r
++\r
++  free(opt_servers);\r
++\r
++  return 0;\r
++}\r
++\r
++\r
++void options_parse(int argc, char *argv[])\r
++{\r
++  static struct option long_options[]=\r
++  {\r
++    {"version", no_argument, NULL, OPT_VERSION},\r
++    {"help", no_argument, NULL, OPT_HELP},\r
++    {"verbose", no_argument, &opt_verbose, OPT_VERBOSE},\r
++    {"debug", no_argument, &opt_verbose, OPT_DEBUG},\r
++    {"servers", required_argument, NULL, OPT_SERVERS},\r
++    {"expire", required_argument, NULL, OPT_EXPIRE},\r
++    {0, 0, 0, 0},\r
++  };\r
+   int option_index= 0;\r
    int option_rv;\r
  \r
    while (1) \r
@@@ -44,10 -45,10 +81,10 @@@
        exit(0);\r
        break;\r
      case OPT_SERVERS: /* --servers or -s */\r
-       opt_servers = optarg;\r
 -      opt_servers= optarg;\r
++      opt_servers= strdup(optarg);\r
        break;\r
      case OPT_EXPIRE: /* --expire */\r
-       expires = (time_t)strtol(optarg, (char **)NULL, 10);\r
 -      expires= (time_t)strtol(optarg, (char **)NULL, 10);\r
++      opt_expire= (time_t)strtoll(optarg, (char **)NULL, 10);\r
        break;\r
      case '?':\r
        /* getopt_long already printed an error message. */\r
@@@ -56,26 -57,25 +93,4 @@@
        abort();\r
      }\r
    }\r
--\r
--  memc= memcached_init(NULL);\r
--  parse_opt_servers(memc, opt_servers);\r
--  \r
--  while (optind <= argc) \r
--  {\r
-     if (opt_verbose) \r
-       printf("key: %s\nexpires: %llu\n", argv[optind], expires);\r
-     rc = memcached_delete(memc, argv[optind], strlen(argv[optind]), expires);\r
 -    if (opt_verbose)\r
 -      printf("key: %s\nexpires: %ld\n", argv[optind], expires);\r
--\r
-     if (rc != MEMCACHED_SUCCESS) \r
-     {\r
 -    rc= memcached_delete(memc, argv[optind], strlen(argv[optind]), expires);\r
 -\r
 -    if (rc != MEMCACHED_SUCCESS)\r
--      fprintf(stderr, "memrm: %s: memcache error %s\n", \r
--            argv[optind], memcached_strerror(memc, rc));\r
-     }\r
--\r
--    optind++;\r
--  }\r
--\r
--  memcached_deinit(memc);\r
--\r
--  return 0;\r
- };\r
+ }\r

diff --cc src/utilities.c
index ce6cd925bdc76d566ca15d4a5243d71102e32a47,5dd66f62731d871651d16eb7a5232bc39797a006..c866dd54038f00960107b789786e4cdff4dbbe3a
--- 1/src/utilities.c
--- 2/src/utilities.c
+++ b/src/utilities.c
@@@ -1,10 -1,7 +1,7 @@@
  #include <memcached.h>
  
- static char **cleanup_list= NULL;
- static char cleanup_list_length= 0;
- 
  void parse_opt_servers(memcached_st *memc,
 -                       char *opt_servers)
 +                       char *server_strings)
  {
    char *string;
    unsigned int port;
@@@ -53,25 -44,4 +50,3 @@@
      }
    }
  }
- 
- void cleanup(void)
- {
-   unsigned int x;
-   for (x= 0; x < cleanup_list_length; x++)
-     free(cleanup_list[x]);
- 
-   free(cleanup_list);
- }
- 
- char *strdup_cleanup(const char *str)
- {
-   char *ptr;
- 
-   ptr= strdup(str);
- 
-   cleanup_list= (char **)realloc(cleanup_list, sizeof(char *) * (cleanup_list_length+1));
-   cleanup_list[cleanup_list_length]= ptr;
-   cleanup_list_length++;
--
-   return ptr;
- }