Update for protocol (and a single fix).

[m6w6/libmemcached] / tests / libmemcached-1.0 / print.cc

diff --git a/tests/libmemcached-1.0/print.cc b/tests/libmemcached-1.0/print.cc
index 789265818bf76f63637c3f84288c8b8ff48d6d64..13c4e1d0268b7b54db9577d8b12ec2dd84b7ae1e 100644 (file)
--- a/tests/libmemcached-1.0/print.cc
+++ b/tests/libmemcached-1.0/print.cc
@@ -47,12 +47,10 @@ using namespace libtest;
 
 #include "tests/print.h"
 
-memcached_return_t server_print_callback(const memcached_st *ptr,
+memcached_return_t server_print_callback(const memcached_st*,
                                          const memcached_server_st *server,
                                          void *context)
 {
-  (void)ptr;
-
   if (context)
   {
     std::cerr << memcached_server_name(server) << ":" << memcached_server_port(server) << std::endl;
@@ -60,3 +58,26 @@ memcached_return_t server_print_callback(const memcached_st *ptr,
 
   return MEMCACHED_SUCCESS;
 }
+
+const char * print_version(memcached_st *memc)
+{
+  memcached_server_fn callbacks[1];
+  callbacks[0]= server_print_version_callback;
+  memcached_server_cursor(memc, callbacks, NULL,  1);
+
+  return "print_version()";
+}
+
+
+memcached_return_t server_print_version_callback(const memcached_st *,
+                                                 const memcached_server_st *server,
+                                                 void *)
+{
+  std::cerr << "Server: " << memcached_server_name(server) << ":" << memcached_server_port(server) << " " 
+    << int(server->major_version) << "."
+    << int(server->minor_version) << "."
+    << int(server->micro_version)
+    << std::endl;
+
+  return MEMCACHED_SUCCESS;
+}