X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=clients%2Fmemrm.cc;h=50ead7a380679a09b61746849c9a6f642cf510cd;hb=5dcfd8799e2ab7d60b8d3b352474d43556d37dcf;hp=4e4cd479e3f79599e04eec240dfe05734831ab08;hpb=74ee88e5faed86095e8ae53c7831e1f1d2249557;p=awesomized%2Flibmemcached

diff --git a/clients/memrm.cc b/clients/memrm.cc
index 4e4cd479..50ead7a3 100644
--- a/clients/memrm.cc
+++ b/clients/memrm.cc
@@ -38,13 +38,10 @@ static void options_parse(int argc, char *argv[]);
 
 int main(int argc, char *argv[])
 {
-  memcached_st *memc;
-  memcached_server_st *servers;
-
   options_parse(argc, argv);
   initialize_sockets();
 
-  if (opt_servers == 0)
+  if (opt_servers == NULL)
   {
     char *temp;
 
@@ -52,17 +49,24 @@ int main(int argc, char *argv[])
     {
       opt_servers= strdup(temp);
     }
-    else
+
+    if (opt_servers == NULL)
     {
       std::cerr << "No Servers provided" << std::endl;
-      return EXIT_FAILURE;
+      exit(EXIT_FAILURE);
     }
   }
 
-  memc= memcached_create(NULL);
+  memcached_server_st* servers= memcached_servers_parse(opt_servers);
+  if (servers == NULL or memcached_server_list_count(servers) == 0)
+  {
+    std::cerr << "Invalid server list provided:" << opt_servers << std::endl;
+    return EXIT_FAILURE;
+  }
+
+  memcached_st* memc= memcached_create(NULL);
   process_hash_option(memc, opt_hash);
 
-  servers= memcached_servers_parse(opt_servers);
   memcached_server_push(memc, servers);
   memcached_server_list_free(servers);
   memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL,
@@ -209,7 +213,7 @@ static void options_parse(int argc, char *argv[])
       opt_expire= (time_t)strtoll(optarg, (char **)NULL, 10);
       if (errno != 0)
       {
-        std::cerr << "Incorrect value passed to --expire: `" << optarg << "`" << std::cerr;
+        std::cerr << "Incorrect value passed to --expire: `" << optarg << "`" << std::endl;
         exit(EXIT_FAILURE);
       }
       break;