Fix failing issue in memstat

diff --git a/lib/libmemcached_probes.h b/lib/libmemcached_probes.h
index ba563ac2e47950ed6b99623b5df45fd6bb85b225..cf59cc595501a8e612d446ff194d2e9e8d3507a8 100644 (file)
--- a/lib/libmemcached_probes.h
+++ b/lib/libmemcached_probes.h
@@ -13,8 +13,6 @@ extern "C" {
 
 #if _DTRACE_VERSION
 
-#warning "Trying to BUILD WITH DTRACE!!!!"
-
 #define        LIBMEMCACHED_MEMCACHED_ADD_END() \
        __dtrace_libmemcached___memcached_add_end()
 #define        LIBMEMCACHED_MEMCACHED_ADD_END_ENABLED() \

diff --git a/src/memstat.c b/src/memstat.c
index d6e315078749285fd56bda874cce033c8629d84b..bc81cb07f195f375444e645d46c61eef4d71e048 100644 (file)
--- a/src/memstat.c
+++ b/src/memstat.c
@@ -35,6 +35,13 @@ int main(int argc, char *argv[])
     parse_opt_servers(memc, opt_servers);
     stat= memcached_stat(memc, NULL, &rc);
 
+    if (rc != MEMCACHED_SUCCESS || rc != MEMCACHED_SOME_ERRORS);
+    {
+      printf("Failure to communicate with servers (%s)\n",
+              memcached_strerror(memc, rc));
+      exit(1);
+    }
+
     server_list= memcached_server_list(memc);
 
     printf("Listing %u Server\n\n", memcached_server_count(memc));
@@ -44,6 +51,7 @@ int main(int argc, char *argv[])
       char **ptr;
 
       list= memcached_stat_get_keys(memc, &stat[x], &rc);
+      assert(list);
       assert(rc == MEMCACHED_SUCCESS);
 
       printf("Server: %s (%u)\n", memcached_server_name(memc, server_list[x]),