X-Git-Url: https://git.m6w6.name/?p=m6w6%2Flibmemcached;a=blobdiff_plain;f=tests%2Flibmemcached-1.0%2Fprint.cc;h=13c4e1d0268b7b54db9577d8b12ec2dd84b7ae1e;hp=789265818bf76f63637c3f84288c8b8ff48d6d64;hb=cb08b8d0a35a78bde8a5b4caccab5dd2d789cca3;hpb=11f92a5b87291fd499db5897800fafacd654f6e9 diff --git a/tests/libmemcached-1.0/print.cc b/tests/libmemcached-1.0/print.cc index 78926581..13c4e1d0 100644 --- 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; +}