From f47caf2833675cce0b62a6e4ffd6764c1490a8b4 Mon Sep 17 00:00:00 2001 From: Brian Aker Date: Thu, 2 Aug 2012 12:14:34 -0400 Subject: [PATCH] Update to support new warnings. --- configure.ac | 10 +- docs/man/hashkit_clone.3 | 2 +- docs/man/hashkit_crc32.3 | 2 +- docs/man/hashkit_create.3 | 2 +- docs/man/hashkit_fnv1_32.3 | 2 +- docs/man/hashkit_fnv1_64.3 | 2 +- docs/man/hashkit_fnv1a_32.3 | 2 +- docs/man/hashkit_fnv1a_64.3 | 2 +- docs/man/hashkit_free.3 | 2 +- docs/man/hashkit_functions.3 | 2 +- docs/man/hashkit_hsieh.3 | 2 +- docs/man/hashkit_is_allocated.3 | 2 +- docs/man/hashkit_jenkins.3 | 2 +- docs/man/hashkit_md5.3 | 2 +- docs/man/hashkit_murmur.3 | 2 +- docs/man/hashkit_value.3 | 2 +- docs/man/libhashkit.3 | 2 +- docs/man/libmemcached.3 | 2 +- docs/man/libmemcached_check_configuration.3 | 2 +- docs/man/libmemcached_configuration.3 | 2 +- docs/man/libmemcached_examples.3 | 2 +- docs/man/libmemcachedutil.3 | 2 +- docs/man/memaslap.1 | 2 +- docs/man/memcached.3 | 2 +- docs/man/memcached_add.3 | 2 +- docs/man/memcached_add_by_key.3 | 2 +- docs/man/memcached_analyze.3 | 2 +- docs/man/memcached_append.3 | 2 +- docs/man/memcached_append_by_key.3 | 2 +- docs/man/memcached_auto.3 | 2 +- docs/man/memcached_behavior.3 | 2 +- docs/man/memcached_behavior_get.3 | 2 +- docs/man/memcached_behavior_set.3 | 2 +- docs/man/memcached_callback.3 | 2 +- docs/man/memcached_callback_get.3 | 2 +- docs/man/memcached_callback_set.3 | 2 +- docs/man/memcached_cas.3 | 2 +- docs/man/memcached_cas_by_key.3 | 2 +- docs/man/memcached_clone.3 | 2 +- docs/man/memcached_create.3 | 2 +- docs/man/memcached_decrement.3 | 2 +- docs/man/memcached_decrement_with_initial.3 | 2 +- docs/man/memcached_delete.3 | 2 +- docs/man/memcached_delete_by_key.3 | 2 +- docs/man/memcached_destroy_sasl_auth_data.3 | 2 +- docs/man/memcached_dump.3 | 2 +- docs/man/memcached_exist.3 | 2 +- docs/man/memcached_exist_by_key.3 | 2 +- docs/man/memcached_fetch.3 | 2 +- docs/man/memcached_fetch_execute.3 | 2 +- docs/man/memcached_fetch_result.3 | 2 +- docs/man/memcached_flush.3 | 2 +- docs/man/memcached_flush_buffers.3 | 2 +- docs/man/memcached_free.3 | 2 +- docs/man/memcached_generate_hash.3 | 2 +- docs/man/memcached_generate_hash_value.3 | 2 +- docs/man/memcached_get.3 | 2 +- docs/man/memcached_get_by_key.3 | 2 +- docs/man/memcached_get_memory_allocators.3 | 2 +- docs/man/memcached_get_sasl_callbacks.3 | 2 +- docs/man/memcached_get_user_data.3 | 2 +- docs/man/memcached_increment.3 | 2 +- docs/man/memcached_increment_with_initial.3 | 2 +- docs/man/memcached_last_error_message.3 | 2 +- docs/man/memcached_lib_version.3 | 2 +- docs/man/memcached_memory_allocators.3 | 2 +- docs/man/memcached_mget.3 | 2 +- docs/man/memcached_mget_by_key.3 | 2 +- docs/man/memcached_mget_execute.3 | 2 +- docs/man/memcached_mget_execute_by_key.3 | 2 +- docs/man/memcached_pool.3 | 2 +- docs/man/memcached_pool_behavior_get.3 | 2 +- docs/man/memcached_pool_behavior_set.3 | 2 +- docs/man/memcached_pool_create.3 | 2 +- docs/man/memcached_pool_destroy.3 | 2 +- docs/man/memcached_pool_fetch.3 | 2 +- docs/man/memcached_pool_pop.3 | 2 +- docs/man/memcached_pool_push.3 | 2 +- docs/man/memcached_pool_release.3 | 2 +- docs/man/memcached_pool_st.3 | 2 +- docs/man/memcached_prepend.3 | 2 +- docs/man/memcached_prepend_by_key.3 | 2 +- docs/man/memcached_quit.3 | 2 +- docs/man/memcached_replace.3 | 2 +- docs/man/memcached_replace_by_key.3 | 2 +- docs/man/memcached_result_cas.3 | 2 +- docs/man/memcached_result_create.3 | 2 +- docs/man/memcached_result_flags.3 | 2 +- docs/man/memcached_result_free.3 | 2 +- docs/man/memcached_result_key_length.3 | 2 +- docs/man/memcached_result_key_value.3 | 2 +- docs/man/memcached_result_length.3 | 2 +- docs/man/memcached_result_st.3 | 2 +- docs/man/memcached_result_value.3 | 2 +- docs/man/memcached_return_t.3 | 2 +- docs/man/memcached_sasl.3 | 2 +- docs/man/memcached_sasl_set_auth_data.3 | 2 +- docs/man/memcached_server_add.3 | 2 +- docs/man/memcached_server_add_unix_socket.3 | 2 +- docs/man/memcached_server_count.3 | 2 +- docs/man/memcached_server_cursor.3 | 2 +- docs/man/memcached_server_list.3 | 2 +- docs/man/memcached_server_list_append.3 | 2 +- docs/man/memcached_server_list_count.3 | 2 +- docs/man/memcached_server_list_free.3 | 2 +- docs/man/memcached_server_push.3 | 2 +- docs/man/memcached_server_st.3 | 2 +- docs/man/memcached_servers.3 | 2 +- docs/man/memcached_servers_parse.3 | 2 +- docs/man/memcached_servers_reset.3 | 2 +- docs/man/memcached_set.3 | 2 +- docs/man/memcached_set_by_key.3 | 2 +- docs/man/memcached_set_encoding_key.3 | 2 +- docs/man/memcached_set_memory_allocators.3 | 2 +- .../memcached_set_memory_allocators_context.3 | 2 +- docs/man/memcached_set_sasl_callbacks.3 | 2 +- docs/man/memcached_set_user_data.3 | 2 +- docs/man/memcached_stat.3 | 2 +- docs/man/memcached_stat_execute.3 | 2 +- docs/man/memcached_stat_get_keys.3 | 2 +- docs/man/memcached_stat_get_value.3 | 2 +- docs/man/memcached_stat_servername.3 | 2 +- docs/man/memcached_stats.3 | 2 +- docs/man/memcached_strerror.3 | 2 +- docs/man/memcached_touch.3 | 2 +- docs/man/memcached_touch_by_key.3 | 2 +- docs/man/memcached_user_data.3 | 2 +- docs/man/memcached_verbosity.3 | 2 +- docs/man/memcached_version.3 | 2 +- docs/man/memcapable.1 | 2 +- docs/man/memcat.1 | 2 +- docs/man/memcp.1 | 2 +- docs/man/memdump.1 | 2 +- docs/man/memerror.1 | 2 +- docs/man/memexist.1 | 2 +- docs/man/memflush.1 | 2 +- docs/man/memparse.1 | 2 +- docs/man/memping.1 | 2 +- docs/man/memrm.1 | 2 +- docs/man/memslap.1 | 2 +- docs/man/memstat.1 | 2 +- docs/man/memtouch.1 | 2 +- example/t/memcached_light.cc | 2 +- libmemcached/connect.cc | 8 + libtest/cmdline.cc | 202 ++++++++++-------- libtest/cmdline.h | 43 ++-- libtest/collection.cc | 21 +- libtest/collection.h | 19 +- libtest/common.h | 1 + libtest/drizzled.cc | 3 +- libtest/fatal.cc | 5 +- libtest/fatal.hpp | 2 +- libtest/framework.cc | 18 +- libtest/framework.h | 30 ++- libtest/gearmand.cc | 2 +- libtest/get.h | 2 +- libtest/has.cc | 22 +- libtest/http.cc | 2 + libtest/http.hpp | 2 + libtest/include.am | 6 +- libtest/main.cc | 34 ++- libtest/memcached.cc | 2 +- libtest/port.h | 2 + libtest/server.cc | 74 ++++--- libtest/server_container.cc | 6 + libtest/skiptest.cc | 2 +- libtest/test.h | 2 +- libtest/unittest.cc | 44 +++- tests/cycle.cc | 2 +- tests/failure.cc | 4 +- tests/hash_plus.cc | 2 +- tests/hashkit_functions.cc | 2 +- tests/libmemcached-1.0/all_tests.cc | 2 +- tests/libmemcached-1.0/all_tests_socket.cc | 2 +- tests/libmemcached-1.0/atomsmasher.cc | 2 +- tests/libmemcached-1.0/internals.cc | 2 +- tests/libmemcached-1.0/plus.cpp | 2 +- tests/libmemcached-1.0/sasl.cc | 2 +- tests/mem_udp.cc | 2 +- tests/memcapable.cc | 4 +- tests/memcat.cc | 2 +- tests/memcp.cc | 2 +- tests/memdump.cc | 2 +- tests/memerror.cc | 2 +- tests/memexist.cc | 4 +- tests/memflush.cc | 4 +- tests/memrm.cc | 2 +- tests/memslap.cc | 2 +- tests/memstat.cc | 4 +- tests/memtouch.cc | 4 +- tests/parser.cc | 2 +- 191 files changed, 521 insertions(+), 385 deletions(-) diff --git a/configure.ac b/configure.ac index 8a18fd7d..bcb2d320 100644 --- a/configure.ac +++ b/configure.ac @@ -298,13 +298,13 @@ AX_CHECK_SOCK_CLOEXEC([AC_DEFINE([HAVE_SOCK_CLOEXEC], [1], [Check for SOCK_CLOEX AX_APPEND_COMPILE_FLAGS([-Werror -Wall]) AX_APPEND_COMPILE_FLAGS([-Werror -Wextra]) -AX_APPEND_COMPILE_FLAGS([-Werror -fstack-protector-all]) -AX_APPEND_COMPILE_FLAGS([-Werror -ggdb]) -AX_APPEND_COMPILE_FLAGS([-Werror -floop-parallelize-all]) -AX_APPEND_COMPILE_FLAGS([-Werror -Wsign-compare]) AX_APPEND_COMPILE_FLAGS([-Werror -Wmaybe-uninitialized]) -AX_APPEND_COMPILE_FLAGS([-Werror -Wunused-variable]) AX_APPEND_COMPILE_FLAGS([-Werror -Wsign-compare]) +AX_APPEND_COMPILE_FLAGS([-Werror -Wunused-result]) +AX_APPEND_COMPILE_FLAGS([-Werror -Wunused-variable]) +AX_APPEND_COMPILE_FLAGS([-Werror -floop-parallelize-all]) +AX_APPEND_COMPILE_FLAGS([-Werror -fstack-protector-all]) +AX_APPEND_COMPILE_FLAGS([-Werror -ggdb]) AC_CONFIG_FILES([ Makefile diff --git a/docs/man/hashkit_clone.3 b/docs/man/hashkit_clone.3 index ff975c52..a6f6b6bc 100644 --- a/docs/man/hashkit_clone.3 +++ b/docs/man/hashkit_clone.3 @@ -1,4 +1,4 @@ -.TH "HASHKIT_CLONE" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "HASHKIT_CLONE" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME hashkit_clone \- libhashkit Documentation . diff --git a/docs/man/hashkit_crc32.3 b/docs/man/hashkit_crc32.3 index 7863dc19..cc211631 100644 --- a/docs/man/hashkit_crc32.3 +++ b/docs/man/hashkit_crc32.3 @@ -1,4 +1,4 @@ -.TH "HASHKIT_CRC32" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "HASHKIT_CRC32" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME hashkit_crc32 \- libhashkit Documentation . diff --git a/docs/man/hashkit_create.3 b/docs/man/hashkit_create.3 index 2b5ead13..d75e60ef 100644 --- a/docs/man/hashkit_create.3 +++ b/docs/man/hashkit_create.3 @@ -1,4 +1,4 @@ -.TH "HASHKIT_CREATE" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "HASHKIT_CREATE" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME hashkit_create \- libhashkit Documentation . diff --git a/docs/man/hashkit_fnv1_32.3 b/docs/man/hashkit_fnv1_32.3 index 5564add7..058dab1d 100644 --- a/docs/man/hashkit_fnv1_32.3 +++ b/docs/man/hashkit_fnv1_32.3 @@ -1,4 +1,4 @@ -.TH "HASHKIT_FNV1_32" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "HASHKIT_FNV1_32" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME hashkit_fnv1_32 \- libhashkit Documentation . diff --git a/docs/man/hashkit_fnv1_64.3 b/docs/man/hashkit_fnv1_64.3 index 469319af..29e21b05 100644 --- a/docs/man/hashkit_fnv1_64.3 +++ b/docs/man/hashkit_fnv1_64.3 @@ -1,4 +1,4 @@ -.TH "HASHKIT_FNV1_64" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "HASHKIT_FNV1_64" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME hashkit_fnv1_64 \- libhashkit Documentation . diff --git a/docs/man/hashkit_fnv1a_32.3 b/docs/man/hashkit_fnv1a_32.3 index adaf912e..f30281ad 100644 --- a/docs/man/hashkit_fnv1a_32.3 +++ b/docs/man/hashkit_fnv1a_32.3 @@ -1,4 +1,4 @@ -.TH "HASHKIT_FNV1A_32" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "HASHKIT_FNV1A_32" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME hashkit_fnv1a_32 \- libhashkit Documentation . diff --git a/docs/man/hashkit_fnv1a_64.3 b/docs/man/hashkit_fnv1a_64.3 index c1b97476..692208a3 100644 --- a/docs/man/hashkit_fnv1a_64.3 +++ b/docs/man/hashkit_fnv1a_64.3 @@ -1,4 +1,4 @@ -.TH "HASHKIT_FNV1A_64" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "HASHKIT_FNV1A_64" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME hashkit_fnv1a_64 \- libhashkit Documentation . diff --git a/docs/man/hashkit_free.3 b/docs/man/hashkit_free.3 index f2f289f1..0d48b15a 100644 --- a/docs/man/hashkit_free.3 +++ b/docs/man/hashkit_free.3 @@ -1,4 +1,4 @@ -.TH "HASHKIT_FREE" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "HASHKIT_FREE" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME hashkit_free \- libhashkit Documentation . diff --git a/docs/man/hashkit_functions.3 b/docs/man/hashkit_functions.3 index bbf90437..318628cf 100644 --- a/docs/man/hashkit_functions.3 +++ b/docs/man/hashkit_functions.3 @@ -1,4 +1,4 @@ -.TH "HASHKIT_FUNCTIONS" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "HASHKIT_FUNCTIONS" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME hashkit_functions \- libhashkit Documentation . diff --git a/docs/man/hashkit_hsieh.3 b/docs/man/hashkit_hsieh.3 index 7c90c3dc..5cc8d369 100644 --- a/docs/man/hashkit_hsieh.3 +++ b/docs/man/hashkit_hsieh.3 @@ -1,4 +1,4 @@ -.TH "HASHKIT_HSIEH" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "HASHKIT_HSIEH" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME hashkit_hsieh \- libhashkit Documentation . diff --git a/docs/man/hashkit_is_allocated.3 b/docs/man/hashkit_is_allocated.3 index a9f3ca5f..d0d67031 100644 --- a/docs/man/hashkit_is_allocated.3 +++ b/docs/man/hashkit_is_allocated.3 @@ -1,4 +1,4 @@ -.TH "HASHKIT_IS_ALLOCATED" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "HASHKIT_IS_ALLOCATED" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME hashkit_is_allocated \- libhashkit Documentation . diff --git a/docs/man/hashkit_jenkins.3 b/docs/man/hashkit_jenkins.3 index d14ab25e..8e142577 100644 --- a/docs/man/hashkit_jenkins.3 +++ b/docs/man/hashkit_jenkins.3 @@ -1,4 +1,4 @@ -.TH "HASHKIT_JENKINS" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "HASHKIT_JENKINS" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME hashkit_jenkins \- libhashkit Documentation . diff --git a/docs/man/hashkit_md5.3 b/docs/man/hashkit_md5.3 index 56b75f99..011e065d 100644 --- a/docs/man/hashkit_md5.3 +++ b/docs/man/hashkit_md5.3 @@ -1,4 +1,4 @@ -.TH "HASHKIT_MD5" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "HASHKIT_MD5" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME hashkit_md5 \- libhashkit Documentation . diff --git a/docs/man/hashkit_murmur.3 b/docs/man/hashkit_murmur.3 index 9f36b22a..ca2dd686 100644 --- a/docs/man/hashkit_murmur.3 +++ b/docs/man/hashkit_murmur.3 @@ -1,4 +1,4 @@ -.TH "HASHKIT_MURMUR" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "HASHKIT_MURMUR" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME hashkit_murmur \- libhashkit Documentation . diff --git a/docs/man/hashkit_value.3 b/docs/man/hashkit_value.3 index 05fbe1e3..e542bb0c 100644 --- a/docs/man/hashkit_value.3 +++ b/docs/man/hashkit_value.3 @@ -1,4 +1,4 @@ -.TH "HASHKIT_VALUE" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "HASHKIT_VALUE" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME hashkit_value \- libhashkit Documentation . diff --git a/docs/man/libhashkit.3 b/docs/man/libhashkit.3 index 20b6cf4a..e26604a1 100644 --- a/docs/man/libhashkit.3 +++ b/docs/man/libhashkit.3 @@ -1,4 +1,4 @@ -.TH "LIBHASHKIT" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "LIBHASHKIT" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME libhashkit \- libhashkit Documentation . diff --git a/docs/man/libmemcached.3 b/docs/man/libmemcached.3 index f3498b87..ff1edc29 100644 --- a/docs/man/libmemcached.3 +++ b/docs/man/libmemcached.3 @@ -1,4 +1,4 @@ -.TH "LIBMEMCACHED" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "LIBMEMCACHED" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME libmemcached \- Introducing the C Client Library for memcached . diff --git a/docs/man/libmemcached_check_configuration.3 b/docs/man/libmemcached_check_configuration.3 index 0953fe98..9f118b1a 100644 --- a/docs/man/libmemcached_check_configuration.3 +++ b/docs/man/libmemcached_check_configuration.3 @@ -1,4 +1,4 @@ -.TH "LIBMEMCACHED_CHECK_CONFIGURATION" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "LIBMEMCACHED_CHECK_CONFIGURATION" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME libmemcached_check_configuration \- libmemcached Documentation . diff --git a/docs/man/libmemcached_configuration.3 b/docs/man/libmemcached_configuration.3 index 6d5a9a1d..ca851575 100644 --- a/docs/man/libmemcached_configuration.3 +++ b/docs/man/libmemcached_configuration.3 @@ -1,4 +1,4 @@ -.TH "LIBMEMCACHED_CONFIGURATION" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "LIBMEMCACHED_CONFIGURATION" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME libmemcached_configuration \- libmemcached Documentation . diff --git a/docs/man/libmemcached_examples.3 b/docs/man/libmemcached_examples.3 index 9a310fce..a08e625d 100644 --- a/docs/man/libmemcached_examples.3 +++ b/docs/man/libmemcached_examples.3 @@ -1,4 +1,4 @@ -.TH "LIBMEMCACHED_EXAMPLES" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "LIBMEMCACHED_EXAMPLES" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME libmemcached_examples \- libmemcached Documentation . diff --git a/docs/man/libmemcachedutil.3 b/docs/man/libmemcachedutil.3 index d3a1852f..675e71ed 100644 --- a/docs/man/libmemcachedutil.3 +++ b/docs/man/libmemcachedutil.3 @@ -1,4 +1,4 @@ -.TH "LIBMEMCACHEDUTIL" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "LIBMEMCACHEDUTIL" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME libmemcachedutil \- libmemcached Documentation . diff --git a/docs/man/memaslap.1 b/docs/man/memaslap.1 index c395258d..e37f1786 100644 --- a/docs/man/memaslap.1 +++ b/docs/man/memaslap.1 @@ -1,4 +1,4 @@ -.TH "MEMASLAP" "1" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMASLAP" "1" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memaslap \- libmemcached Documentation . diff --git a/docs/man/memcached.3 b/docs/man/memcached.3 index 543a288f..73b8c6d0 100644 --- a/docs/man/memcached.3 +++ b/docs/man/memcached.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached \- libmemcached Documentation . diff --git a/docs/man/memcached_add.3 b/docs/man/memcached_add.3 index 95e46332..a20248a5 100644 --- a/docs/man/memcached_add.3 +++ b/docs/man/memcached_add.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_ADD" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_ADD" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_add \- Storing and Replacing Data . diff --git a/docs/man/memcached_add_by_key.3 b/docs/man/memcached_add_by_key.3 index 3291daad..ea5d6b67 100644 --- a/docs/man/memcached_add_by_key.3 +++ b/docs/man/memcached_add_by_key.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_ADD_BY_KEY" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_ADD_BY_KEY" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_add_by_key \- Storing and Replacing Data . diff --git a/docs/man/memcached_analyze.3 b/docs/man/memcached_analyze.3 index 52a0348f..bafd5f98 100644 --- a/docs/man/memcached_analyze.3 +++ b/docs/man/memcached_analyze.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_ANALYZE" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_ANALYZE" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_analyze \- libmemcached Documentation . diff --git a/docs/man/memcached_append.3 b/docs/man/memcached_append.3 index 9ad00c8f..828c4de3 100644 --- a/docs/man/memcached_append.3 +++ b/docs/man/memcached_append.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_APPEND" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_APPEND" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_append \- Appending to or Prepending to data on the server . diff --git a/docs/man/memcached_append_by_key.3 b/docs/man/memcached_append_by_key.3 index 64fbc194..df672948 100644 --- a/docs/man/memcached_append_by_key.3 +++ b/docs/man/memcached_append_by_key.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_APPEND_BY_KEY" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_APPEND_BY_KEY" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_append_by_key \- Appending to or Prepending to data on the server . diff --git a/docs/man/memcached_auto.3 b/docs/man/memcached_auto.3 index ca105159..2d0004ab 100644 --- a/docs/man/memcached_auto.3 +++ b/docs/man/memcached_auto.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_AUTO" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_AUTO" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_auto \- Incrementing and Decrementing Values . diff --git a/docs/man/memcached_behavior.3 b/docs/man/memcached_behavior.3 index 2ebd1b95..d26cbb6e 100644 --- a/docs/man/memcached_behavior.3 +++ b/docs/man/memcached_behavior.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_BEHAVIOR" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_BEHAVIOR" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_behavior \- libmemcached Documentation . diff --git a/docs/man/memcached_behavior_get.3 b/docs/man/memcached_behavior_get.3 index 7de46afe..f92394cf 100644 --- a/docs/man/memcached_behavior_get.3 +++ b/docs/man/memcached_behavior_get.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_BEHAVIOR_GET" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_BEHAVIOR_GET" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_behavior_get \- libmemcached Documentation . diff --git a/docs/man/memcached_behavior_set.3 b/docs/man/memcached_behavior_set.3 index bf8ef2f5..33b8ff06 100644 --- a/docs/man/memcached_behavior_set.3 +++ b/docs/man/memcached_behavior_set.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_BEHAVIOR_SET" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_BEHAVIOR_SET" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_behavior_set \- libmemcached Documentation . diff --git a/docs/man/memcached_callback.3 b/docs/man/memcached_callback.3 index 32429fb6..8384ebb3 100644 --- a/docs/man/memcached_callback.3 +++ b/docs/man/memcached_callback.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_CALLBACK" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_CALLBACK" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_callback \- libmemcached Documentation . diff --git a/docs/man/memcached_callback_get.3 b/docs/man/memcached_callback_get.3 index abd8a462..49fd0967 100644 --- a/docs/man/memcached_callback_get.3 +++ b/docs/man/memcached_callback_get.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_CALLBACK_GET" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_CALLBACK_GET" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_callback_get \- libmemcached Documentation . diff --git a/docs/man/memcached_callback_set.3 b/docs/man/memcached_callback_set.3 index 608df40e..e4a418ec 100644 --- a/docs/man/memcached_callback_set.3 +++ b/docs/man/memcached_callback_set.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_CALLBACK_SET" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_CALLBACK_SET" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_callback_set \- libmemcached Documentation . diff --git a/docs/man/memcached_cas.3 b/docs/man/memcached_cas.3 index 34c262d0..75f2c506 100644 --- a/docs/man/memcached_cas.3 +++ b/docs/man/memcached_cas.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_CAS" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_CAS" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_cas \- Working with data on the server in an atomic fashion . diff --git a/docs/man/memcached_cas_by_key.3 b/docs/man/memcached_cas_by_key.3 index 5f1bd2c3..5a4c545b 100644 --- a/docs/man/memcached_cas_by_key.3 +++ b/docs/man/memcached_cas_by_key.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_CAS_BY_KEY" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_CAS_BY_KEY" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_cas_by_key \- Storing and Replacing Data . diff --git a/docs/man/memcached_clone.3 b/docs/man/memcached_clone.3 index 58ff91de..6c679f02 100644 --- a/docs/man/memcached_clone.3 +++ b/docs/man/memcached_clone.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_CLONE" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_CLONE" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_clone \- libmemcached Documentation . diff --git a/docs/man/memcached_create.3 b/docs/man/memcached_create.3 index 6ae829ad..7aa5c44d 100644 --- a/docs/man/memcached_create.3 +++ b/docs/man/memcached_create.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_CREATE" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_CREATE" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_create \- libmemcached Documentation . diff --git a/docs/man/memcached_decrement.3 b/docs/man/memcached_decrement.3 index 34344e65..8db2e380 100644 --- a/docs/man/memcached_decrement.3 +++ b/docs/man/memcached_decrement.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_DECREMENT" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_DECREMENT" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_decrement \- Incrementing and Decrementing Values . diff --git a/docs/man/memcached_decrement_with_initial.3 b/docs/man/memcached_decrement_with_initial.3 index bb2999ea..dcba8ab9 100644 --- a/docs/man/memcached_decrement_with_initial.3 +++ b/docs/man/memcached_decrement_with_initial.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_DECREMENT_WITH_INITIAL" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_DECREMENT_WITH_INITIAL" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_decrement_with_initial \- Incrementing and Decrementing Values . diff --git a/docs/man/memcached_delete.3 b/docs/man/memcached_delete.3 index e4a3265f..8017b011 100644 --- a/docs/man/memcached_delete.3 +++ b/docs/man/memcached_delete.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_DELETE" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_DELETE" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_delete \- libmemcached Documentation . diff --git a/docs/man/memcached_delete_by_key.3 b/docs/man/memcached_delete_by_key.3 index caede555..e85410b3 100644 --- a/docs/man/memcached_delete_by_key.3 +++ b/docs/man/memcached_delete_by_key.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_DELETE_BY_KEY" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_DELETE_BY_KEY" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_delete_by_key \- libmemcached Documentation . diff --git a/docs/man/memcached_destroy_sasl_auth_data.3 b/docs/man/memcached_destroy_sasl_auth_data.3 index dc6812d1..aa5ad6cf 100644 --- a/docs/man/memcached_destroy_sasl_auth_data.3 +++ b/docs/man/memcached_destroy_sasl_auth_data.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_DESTROY_SASL_AUTH_DATA" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_DESTROY_SASL_AUTH_DATA" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_destroy_sasl_auth_data \- libmemcached Documentation . diff --git a/docs/man/memcached_dump.3 b/docs/man/memcached_dump.3 index 40975666..c7f1ad64 100644 --- a/docs/man/memcached_dump.3 +++ b/docs/man/memcached_dump.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_DUMP" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_DUMP" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_dump \- libmemcached Documentation . diff --git a/docs/man/memcached_exist.3 b/docs/man/memcached_exist.3 index e8ddd1b0..13bb7682 100644 --- a/docs/man/memcached_exist.3 +++ b/docs/man/memcached_exist.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_EXIST" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_EXIST" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_exist \- libmemcached Documentation . diff --git a/docs/man/memcached_exist_by_key.3 b/docs/man/memcached_exist_by_key.3 index dd1c6b53..2dc88b5a 100644 --- a/docs/man/memcached_exist_by_key.3 +++ b/docs/man/memcached_exist_by_key.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_EXIST_BY_KEY" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_EXIST_BY_KEY" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_exist_by_key \- libmemcached Documentation . diff --git a/docs/man/memcached_fetch.3 b/docs/man/memcached_fetch.3 index d1e43357..e9a2a1c9 100644 --- a/docs/man/memcached_fetch.3 +++ b/docs/man/memcached_fetch.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_FETCH" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_FETCH" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_fetch \- Retrieving data from the server . diff --git a/docs/man/memcached_fetch_execute.3 b/docs/man/memcached_fetch_execute.3 index 130b4fdc..aa8fbb33 100644 --- a/docs/man/memcached_fetch_execute.3 +++ b/docs/man/memcached_fetch_execute.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_FETCH_EXECUTE" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_FETCH_EXECUTE" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_fetch_execute \- Retrieving data from the server . diff --git a/docs/man/memcached_fetch_result.3 b/docs/man/memcached_fetch_result.3 index 2264ba82..6d0c0e7b 100644 --- a/docs/man/memcached_fetch_result.3 +++ b/docs/man/memcached_fetch_result.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_FETCH_RESULT" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_FETCH_RESULT" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_fetch_result \- Retrieving data from the server . diff --git a/docs/man/memcached_flush.3 b/docs/man/memcached_flush.3 index f0ce46d8..9b64ac47 100644 --- a/docs/man/memcached_flush.3 +++ b/docs/man/memcached_flush.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_FLUSH" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_FLUSH" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_flush \- libmemcached Documentation . diff --git a/docs/man/memcached_flush_buffers.3 b/docs/man/memcached_flush_buffers.3 index 60f78ad4..71a1ad86 100644 --- a/docs/man/memcached_flush_buffers.3 +++ b/docs/man/memcached_flush_buffers.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_FLUSH_BUFFERS" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_FLUSH_BUFFERS" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_flush_buffers \- libmemcached Documentation . diff --git a/docs/man/memcached_free.3 b/docs/man/memcached_free.3 index b42771e4..42bb6e39 100644 --- a/docs/man/memcached_free.3 +++ b/docs/man/memcached_free.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_FREE" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_FREE" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_free \- libmemcached Documentation . diff --git a/docs/man/memcached_generate_hash.3 b/docs/man/memcached_generate_hash.3 index 0b397e1d..43782b6e 100644 --- a/docs/man/memcached_generate_hash.3 +++ b/docs/man/memcached_generate_hash.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_GENERATE_HASH" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_GENERATE_HASH" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_generate_hash \- Generating hash values directly . diff --git a/docs/man/memcached_generate_hash_value.3 b/docs/man/memcached_generate_hash_value.3 index 1c8c597b..d16daa36 100644 --- a/docs/man/memcached_generate_hash_value.3 +++ b/docs/man/memcached_generate_hash_value.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_GENERATE_HASH_VALUE" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_GENERATE_HASH_VALUE" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_generate_hash_value \- Generating hash values directly . diff --git a/docs/man/memcached_get.3 b/docs/man/memcached_get.3 index 1a8edcec..313ac2d7 100644 --- a/docs/man/memcached_get.3 +++ b/docs/man/memcached_get.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_GET" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_GET" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_get \- Retrieving data from the server . diff --git a/docs/man/memcached_get_by_key.3 b/docs/man/memcached_get_by_key.3 index 35e6d169..cf5df925 100644 --- a/docs/man/memcached_get_by_key.3 +++ b/docs/man/memcached_get_by_key.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_GET_BY_KEY" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_GET_BY_KEY" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_get_by_key \- Retrieving data from the server . diff --git a/docs/man/memcached_get_memory_allocators.3 b/docs/man/memcached_get_memory_allocators.3 index 2a7e925e..7fae3696 100644 --- a/docs/man/memcached_get_memory_allocators.3 +++ b/docs/man/memcached_get_memory_allocators.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_GET_MEMORY_ALLOCATORS" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_GET_MEMORY_ALLOCATORS" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_get_memory_allocators \- libmemcached Documentation . diff --git a/docs/man/memcached_get_sasl_callbacks.3 b/docs/man/memcached_get_sasl_callbacks.3 index b202233f..b975371c 100644 --- a/docs/man/memcached_get_sasl_callbacks.3 +++ b/docs/man/memcached_get_sasl_callbacks.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_GET_SASL_CALLBACKS" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_GET_SASL_CALLBACKS" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_get_sasl_callbacks \- libmemcached Documentation . diff --git a/docs/man/memcached_get_user_data.3 b/docs/man/memcached_get_user_data.3 index a7dff265..907a6334 100644 --- a/docs/man/memcached_get_user_data.3 +++ b/docs/man/memcached_get_user_data.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_GET_USER_DATA" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_GET_USER_DATA" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_get_user_data \- libmemcached Documentation . diff --git a/docs/man/memcached_increment.3 b/docs/man/memcached_increment.3 index b71dd5df..aeb7f6bf 100644 --- a/docs/man/memcached_increment.3 +++ b/docs/man/memcached_increment.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_INCREMENT" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_INCREMENT" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_increment \- Incrementing and Decrementing Values . diff --git a/docs/man/memcached_increment_with_initial.3 b/docs/man/memcached_increment_with_initial.3 index 58b1f8cf..75e3acb5 100644 --- a/docs/man/memcached_increment_with_initial.3 +++ b/docs/man/memcached_increment_with_initial.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_INCREMENT_WITH_INITIAL" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_INCREMENT_WITH_INITIAL" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_increment_with_initial \- Incrementing and Decrementing Values . diff --git a/docs/man/memcached_last_error_message.3 b/docs/man/memcached_last_error_message.3 index 9f05e07c..8e630e61 100644 --- a/docs/man/memcached_last_error_message.3 +++ b/docs/man/memcached_last_error_message.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_LAST_ERROR_MESSAGE" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_LAST_ERROR_MESSAGE" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_last_error_message \- libmemcached Documentation . diff --git a/docs/man/memcached_lib_version.3 b/docs/man/memcached_lib_version.3 index 46f49250..992925b1 100644 --- a/docs/man/memcached_lib_version.3 +++ b/docs/man/memcached_lib_version.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_LIB_VERSION" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_LIB_VERSION" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_lib_version \- libmemcached Documentation . diff --git a/docs/man/memcached_memory_allocators.3 b/docs/man/memcached_memory_allocators.3 index cfb23c1c..b46f39c6 100644 --- a/docs/man/memcached_memory_allocators.3 +++ b/docs/man/memcached_memory_allocators.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_MEMORY_ALLOCATORS" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_MEMORY_ALLOCATORS" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_memory_allocators \- libmemcached Documentation . diff --git a/docs/man/memcached_mget.3 b/docs/man/memcached_mget.3 index a444bdea..a9af0d14 100644 --- a/docs/man/memcached_mget.3 +++ b/docs/man/memcached_mget.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_MGET" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_MGET" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_mget \- Retrieving data from the server . diff --git a/docs/man/memcached_mget_by_key.3 b/docs/man/memcached_mget_by_key.3 index 2371a961..a415f072 100644 --- a/docs/man/memcached_mget_by_key.3 +++ b/docs/man/memcached_mget_by_key.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_MGET_BY_KEY" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_MGET_BY_KEY" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_mget_by_key \- Retrieving data from the server . diff --git a/docs/man/memcached_mget_execute.3 b/docs/man/memcached_mget_execute.3 index 04797e23..a73c2ba6 100644 --- a/docs/man/memcached_mget_execute.3 +++ b/docs/man/memcached_mget_execute.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_MGET_EXECUTE" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_MGET_EXECUTE" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_mget_execute \- Retrieving data from the server . diff --git a/docs/man/memcached_mget_execute_by_key.3 b/docs/man/memcached_mget_execute_by_key.3 index b77aaf6f..93e93463 100644 --- a/docs/man/memcached_mget_execute_by_key.3 +++ b/docs/man/memcached_mget_execute_by_key.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_MGET_EXECUTE_BY_KEY" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_MGET_EXECUTE_BY_KEY" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_mget_execute_by_key \- Retrieving data from the server . diff --git a/docs/man/memcached_pool.3 b/docs/man/memcached_pool.3 index 3b0a3afb..144a9ba6 100644 --- a/docs/man/memcached_pool.3 +++ b/docs/man/memcached_pool.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_POOL" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_POOL" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_pool \- libmemcached Documentation . diff --git a/docs/man/memcached_pool_behavior_get.3 b/docs/man/memcached_pool_behavior_get.3 index aa052825..197984f1 100644 --- a/docs/man/memcached_pool_behavior_get.3 +++ b/docs/man/memcached_pool_behavior_get.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_POOL_BEHAVIOR_GET" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_POOL_BEHAVIOR_GET" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_pool_behavior_get \- libmemcached Documentation . diff --git a/docs/man/memcached_pool_behavior_set.3 b/docs/man/memcached_pool_behavior_set.3 index 7cb85496..dc5e5814 100644 --- a/docs/man/memcached_pool_behavior_set.3 +++ b/docs/man/memcached_pool_behavior_set.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_POOL_BEHAVIOR_SET" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_POOL_BEHAVIOR_SET" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_pool_behavior_set \- libmemcached Documentation . diff --git a/docs/man/memcached_pool_create.3 b/docs/man/memcached_pool_create.3 index 1c877546..dc42e60c 100644 --- a/docs/man/memcached_pool_create.3 +++ b/docs/man/memcached_pool_create.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_POOL_CREATE" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_POOL_CREATE" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_pool_create \- libmemcached Documentation . diff --git a/docs/man/memcached_pool_destroy.3 b/docs/man/memcached_pool_destroy.3 index 4080825c..0f5b2583 100644 --- a/docs/man/memcached_pool_destroy.3 +++ b/docs/man/memcached_pool_destroy.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_POOL_DESTROY" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_POOL_DESTROY" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_pool_destroy \- libmemcached Documentation . diff --git a/docs/man/memcached_pool_fetch.3 b/docs/man/memcached_pool_fetch.3 index 31079a4d..dcd46115 100644 --- a/docs/man/memcached_pool_fetch.3 +++ b/docs/man/memcached_pool_fetch.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_POOL_FETCH" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_POOL_FETCH" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_pool_fetch \- libmemcached Documentation . diff --git a/docs/man/memcached_pool_pop.3 b/docs/man/memcached_pool_pop.3 index 3384c73e..b75a6062 100644 --- a/docs/man/memcached_pool_pop.3 +++ b/docs/man/memcached_pool_pop.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_POOL_POP" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_POOL_POP" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_pool_pop \- libmemcached Documentation . diff --git a/docs/man/memcached_pool_push.3 b/docs/man/memcached_pool_push.3 index 02229b6b..b8f9dff4 100644 --- a/docs/man/memcached_pool_push.3 +++ b/docs/man/memcached_pool_push.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_POOL_PUSH" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_POOL_PUSH" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_pool_push \- libmemcached Documentation . diff --git a/docs/man/memcached_pool_release.3 b/docs/man/memcached_pool_release.3 index 6e6d3d26..ec4e35b3 100644 --- a/docs/man/memcached_pool_release.3 +++ b/docs/man/memcached_pool_release.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_POOL_RELEASE" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_POOL_RELEASE" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_pool_release \- libmemcached Documentation . diff --git a/docs/man/memcached_pool_st.3 b/docs/man/memcached_pool_st.3 index b0f5ea7c..431d554a 100644 --- a/docs/man/memcached_pool_st.3 +++ b/docs/man/memcached_pool_st.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_POOL_ST" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_POOL_ST" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_pool_st \- libmemcached Documentation . diff --git a/docs/man/memcached_prepend.3 b/docs/man/memcached_prepend.3 index 864bd1a1..6be7cb94 100644 --- a/docs/man/memcached_prepend.3 +++ b/docs/man/memcached_prepend.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_PREPEND" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_PREPEND" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_prepend \- Appending to or Prepending to data on the server . diff --git a/docs/man/memcached_prepend_by_key.3 b/docs/man/memcached_prepend_by_key.3 index 67a8576b..0b1a785a 100644 --- a/docs/man/memcached_prepend_by_key.3 +++ b/docs/man/memcached_prepend_by_key.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_PREPEND_BY_KEY" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_PREPEND_BY_KEY" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_prepend_by_key \- Appending to or Prepending to data on the server . diff --git a/docs/man/memcached_quit.3 b/docs/man/memcached_quit.3 index b39f923e..70c4c364 100644 --- a/docs/man/memcached_quit.3 +++ b/docs/man/memcached_quit.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_QUIT" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_QUIT" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_quit \- libmemcached Documentation . diff --git a/docs/man/memcached_replace.3 b/docs/man/memcached_replace.3 index 63b4a01c..54d18b81 100644 --- a/docs/man/memcached_replace.3 +++ b/docs/man/memcached_replace.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_REPLACE" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_REPLACE" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_replace \- Storing and Replacing Data . diff --git a/docs/man/memcached_replace_by_key.3 b/docs/man/memcached_replace_by_key.3 index 3fb866a3..c9f9dea3 100644 --- a/docs/man/memcached_replace_by_key.3 +++ b/docs/man/memcached_replace_by_key.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_REPLACE_BY_KEY" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_REPLACE_BY_KEY" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_replace_by_key \- Storing and Replacing Data . diff --git a/docs/man/memcached_result_cas.3 b/docs/man/memcached_result_cas.3 index 197ac395..47899c6d 100644 --- a/docs/man/memcached_result_cas.3 +++ b/docs/man/memcached_result_cas.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_RESULT_CAS" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_RESULT_CAS" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_result_cas \- Working with result sets . diff --git a/docs/man/memcached_result_create.3 b/docs/man/memcached_result_create.3 index 78f321d5..5823a808 100644 --- a/docs/man/memcached_result_create.3 +++ b/docs/man/memcached_result_create.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_RESULT_CREATE" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_RESULT_CREATE" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_result_create \- Working with result sets . diff --git a/docs/man/memcached_result_flags.3 b/docs/man/memcached_result_flags.3 index 55a0b655..51880252 100644 --- a/docs/man/memcached_result_flags.3 +++ b/docs/man/memcached_result_flags.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_RESULT_FLAGS" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_RESULT_FLAGS" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_result_flags \- Working with result sets . diff --git a/docs/man/memcached_result_free.3 b/docs/man/memcached_result_free.3 index 28852248..7e96d938 100644 --- a/docs/man/memcached_result_free.3 +++ b/docs/man/memcached_result_free.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_RESULT_FREE" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_RESULT_FREE" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_result_free \- Working with result sets . diff --git a/docs/man/memcached_result_key_length.3 b/docs/man/memcached_result_key_length.3 index b1e098fd..3d13ca22 100644 --- a/docs/man/memcached_result_key_length.3 +++ b/docs/man/memcached_result_key_length.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_RESULT_KEY_LENGTH" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_RESULT_KEY_LENGTH" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_result_key_length \- Working with result sets . diff --git a/docs/man/memcached_result_key_value.3 b/docs/man/memcached_result_key_value.3 index c178f0c1..e2e82258 100644 --- a/docs/man/memcached_result_key_value.3 +++ b/docs/man/memcached_result_key_value.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_RESULT_KEY_VALUE" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_RESULT_KEY_VALUE" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_result_key_value \- Working with result sets . diff --git a/docs/man/memcached_result_length.3 b/docs/man/memcached_result_length.3 index 4c710df5..5825830b 100644 --- a/docs/man/memcached_result_length.3 +++ b/docs/man/memcached_result_length.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_RESULT_LENGTH" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_RESULT_LENGTH" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_result_length \- Working with result sets . diff --git a/docs/man/memcached_result_st.3 b/docs/man/memcached_result_st.3 index 8f976bec..f850ee2f 100644 --- a/docs/man/memcached_result_st.3 +++ b/docs/man/memcached_result_st.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_RESULT_ST" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_RESULT_ST" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_result_st \- Working with result sets . diff --git a/docs/man/memcached_result_value.3 b/docs/man/memcached_result_value.3 index 3e149b80..319a7834 100644 --- a/docs/man/memcached_result_value.3 +++ b/docs/man/memcached_result_value.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_RESULT_VALUE" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_RESULT_VALUE" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_result_value \- Working with result sets . diff --git a/docs/man/memcached_return_t.3 b/docs/man/memcached_return_t.3 index 2952c43e..3eb2a4f3 100644 --- a/docs/man/memcached_return_t.3 +++ b/docs/man/memcached_return_t.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_RETURN_T" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_RETURN_T" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_return_t \- Return type values . diff --git a/docs/man/memcached_sasl.3 b/docs/man/memcached_sasl.3 index f1203530..11f9fc11 100644 --- a/docs/man/memcached_sasl.3 +++ b/docs/man/memcached_sasl.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_SASL" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_SASL" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_sasl \- libmemcached Documentation . diff --git a/docs/man/memcached_sasl_set_auth_data.3 b/docs/man/memcached_sasl_set_auth_data.3 index 8cb9bf95..fa6dfc6c 100644 --- a/docs/man/memcached_sasl_set_auth_data.3 +++ b/docs/man/memcached_sasl_set_auth_data.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_SASL_SET_AUTH_DATA" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_SASL_SET_AUTH_DATA" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_sasl_set_auth_data \- libmemcached Documentation . diff --git a/docs/man/memcached_server_add.3 b/docs/man/memcached_server_add.3 index c6f9a5d0..e808e773 100644 --- a/docs/man/memcached_server_add.3 +++ b/docs/man/memcached_server_add.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_SERVER_ADD" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_SERVER_ADD" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_server_add \- libmemcached Documentation . diff --git a/docs/man/memcached_server_add_unix_socket.3 b/docs/man/memcached_server_add_unix_socket.3 index 630be74a..89b46a6f 100644 --- a/docs/man/memcached_server_add_unix_socket.3 +++ b/docs/man/memcached_server_add_unix_socket.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_SERVER_ADD_UNIX_SOCKET" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_SERVER_ADD_UNIX_SOCKET" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_server_add_unix_socket \- libmemcached Documentation . diff --git a/docs/man/memcached_server_count.3 b/docs/man/memcached_server_count.3 index 578db462..cf0a13d0 100644 --- a/docs/man/memcached_server_count.3 +++ b/docs/man/memcached_server_count.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_SERVER_COUNT" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_SERVER_COUNT" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_server_count \- libmemcached Documentation . diff --git a/docs/man/memcached_server_cursor.3 b/docs/man/memcached_server_cursor.3 index c004a544..d97365d4 100644 --- a/docs/man/memcached_server_cursor.3 +++ b/docs/man/memcached_server_cursor.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_SERVER_CURSOR" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_SERVER_CURSOR" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_server_cursor \- libmemcached Documentation . diff --git a/docs/man/memcached_server_list.3 b/docs/man/memcached_server_list.3 index f0f2c326..0f73953b 100644 --- a/docs/man/memcached_server_list.3 +++ b/docs/man/memcached_server_list.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_SERVER_LIST" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_SERVER_LIST" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_server_list \- libmemcached Documentation . diff --git a/docs/man/memcached_server_list_append.3 b/docs/man/memcached_server_list_append.3 index 777a6e79..79a3127a 100644 --- a/docs/man/memcached_server_list_append.3 +++ b/docs/man/memcached_server_list_append.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_SERVER_LIST_APPEND" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_SERVER_LIST_APPEND" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_server_list_append \- libmemcached Documentation . diff --git a/docs/man/memcached_server_list_count.3 b/docs/man/memcached_server_list_count.3 index 981bd3e4..8cbf88aa 100644 --- a/docs/man/memcached_server_list_count.3 +++ b/docs/man/memcached_server_list_count.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_SERVER_LIST_COUNT" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_SERVER_LIST_COUNT" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_server_list_count \- libmemcached Documentation . diff --git a/docs/man/memcached_server_list_free.3 b/docs/man/memcached_server_list_free.3 index d0a4a667..e4491240 100644 --- a/docs/man/memcached_server_list_free.3 +++ b/docs/man/memcached_server_list_free.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_SERVER_LIST_FREE" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_SERVER_LIST_FREE" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_server_list_free \- libmemcached Documentation . diff --git a/docs/man/memcached_server_push.3 b/docs/man/memcached_server_push.3 index 2d41c231..02b535ef 100644 --- a/docs/man/memcached_server_push.3 +++ b/docs/man/memcached_server_push.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_SERVER_PUSH" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_SERVER_PUSH" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_server_push \- libmemcached Documentation . diff --git a/docs/man/memcached_server_st.3 b/docs/man/memcached_server_st.3 index 83e288ea..2880563e 100644 --- a/docs/man/memcached_server_st.3 +++ b/docs/man/memcached_server_st.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_SERVER_ST" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_SERVER_ST" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_server_st \- libmemcached Documentation . diff --git a/docs/man/memcached_servers.3 b/docs/man/memcached_servers.3 index 65852926..a242953a 100644 --- a/docs/man/memcached_servers.3 +++ b/docs/man/memcached_servers.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_SERVERS" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_SERVERS" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_servers \- libmemcached Documentation . diff --git a/docs/man/memcached_servers_parse.3 b/docs/man/memcached_servers_parse.3 index c769f5c3..abb2fcf1 100644 --- a/docs/man/memcached_servers_parse.3 +++ b/docs/man/memcached_servers_parse.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_SERVERS_PARSE" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_SERVERS_PARSE" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_servers_parse \- libmemcached Documentation . diff --git a/docs/man/memcached_servers_reset.3 b/docs/man/memcached_servers_reset.3 index fdf89337..de28f1f1 100644 --- a/docs/man/memcached_servers_reset.3 +++ b/docs/man/memcached_servers_reset.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_SERVERS_RESET" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_SERVERS_RESET" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_servers_reset \- libmemcached Documentation . diff --git a/docs/man/memcached_set.3 b/docs/man/memcached_set.3 index ed512111..aa3eddc6 100644 --- a/docs/man/memcached_set.3 +++ b/docs/man/memcached_set.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_SET" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_SET" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_set \- Storing and Replacing Data . diff --git a/docs/man/memcached_set_by_key.3 b/docs/man/memcached_set_by_key.3 index f059a21d..f1a0ec15 100644 --- a/docs/man/memcached_set_by_key.3 +++ b/docs/man/memcached_set_by_key.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_SET_BY_KEY" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_SET_BY_KEY" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_set_by_key \- Storing and Replacing Data . diff --git a/docs/man/memcached_set_encoding_key.3 b/docs/man/memcached_set_encoding_key.3 index 4d199c7d..0d94edd7 100644 --- a/docs/man/memcached_set_encoding_key.3 +++ b/docs/man/memcached_set_encoding_key.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_SET_ENCODING_KEY" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_SET_ENCODING_KEY" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_set_encoding_key \- libmemcached Documentation . diff --git a/docs/man/memcached_set_memory_allocators.3 b/docs/man/memcached_set_memory_allocators.3 index e625312c..33db32af 100644 --- a/docs/man/memcached_set_memory_allocators.3 +++ b/docs/man/memcached_set_memory_allocators.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_SET_MEMORY_ALLOCATORS" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_SET_MEMORY_ALLOCATORS" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_set_memory_allocators \- libmemcached Documentation . diff --git a/docs/man/memcached_set_memory_allocators_context.3 b/docs/man/memcached_set_memory_allocators_context.3 index 2825146e..81168cfc 100644 --- a/docs/man/memcached_set_memory_allocators_context.3 +++ b/docs/man/memcached_set_memory_allocators_context.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_SET_MEMORY_ALLOCATORS_CONTEXT" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_SET_MEMORY_ALLOCATORS_CONTEXT" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_set_memory_allocators_context \- libmemcached Documentation . diff --git a/docs/man/memcached_set_sasl_callbacks.3 b/docs/man/memcached_set_sasl_callbacks.3 index d211ad98..c4055641 100644 --- a/docs/man/memcached_set_sasl_callbacks.3 +++ b/docs/man/memcached_set_sasl_callbacks.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_SET_SASL_CALLBACKS" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_SET_SASL_CALLBACKS" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_set_sasl_callbacks \- libmemcached Documentation . diff --git a/docs/man/memcached_set_user_data.3 b/docs/man/memcached_set_user_data.3 index 62229aea..bcb4d033 100644 --- a/docs/man/memcached_set_user_data.3 +++ b/docs/man/memcached_set_user_data.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_SET_USER_DATA" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_SET_USER_DATA" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_set_user_data \- libmemcached Documentation . diff --git a/docs/man/memcached_stat.3 b/docs/man/memcached_stat.3 index e8e0cb2b..cf34d0d7 100644 --- a/docs/man/memcached_stat.3 +++ b/docs/man/memcached_stat.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_STAT" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_STAT" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_stat \- libmemcached Documentation . diff --git a/docs/man/memcached_stat_execute.3 b/docs/man/memcached_stat_execute.3 index 47ae0853..ca6bcfb4 100644 --- a/docs/man/memcached_stat_execute.3 +++ b/docs/man/memcached_stat_execute.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_STAT_EXECUTE" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_STAT_EXECUTE" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_stat_execute \- libmemcached Documentation . diff --git a/docs/man/memcached_stat_get_keys.3 b/docs/man/memcached_stat_get_keys.3 index 9d5d4e64..ecf429c0 100644 --- a/docs/man/memcached_stat_get_keys.3 +++ b/docs/man/memcached_stat_get_keys.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_STAT_GET_KEYS" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_STAT_GET_KEYS" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_stat_get_keys \- libmemcached Documentation . diff --git a/docs/man/memcached_stat_get_value.3 b/docs/man/memcached_stat_get_value.3 index 8059f23b..2ddb34d9 100644 --- a/docs/man/memcached_stat_get_value.3 +++ b/docs/man/memcached_stat_get_value.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_STAT_GET_VALUE" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_STAT_GET_VALUE" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_stat_get_value \- libmemcached Documentation . diff --git a/docs/man/memcached_stat_servername.3 b/docs/man/memcached_stat_servername.3 index dcd3a83a..d9818677 100644 --- a/docs/man/memcached_stat_servername.3 +++ b/docs/man/memcached_stat_servername.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_STAT_SERVERNAME" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_STAT_SERVERNAME" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_stat_servername \- libmemcached Documentation . diff --git a/docs/man/memcached_stats.3 b/docs/man/memcached_stats.3 index 3e2be69e..5853855e 100644 --- a/docs/man/memcached_stats.3 +++ b/docs/man/memcached_stats.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_STATS" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_STATS" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_stats \- libmemcached Documentation . diff --git a/docs/man/memcached_strerror.3 b/docs/man/memcached_strerror.3 index 2cf55113..20d81eaa 100644 --- a/docs/man/memcached_strerror.3 +++ b/docs/man/memcached_strerror.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_STRERROR" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_STRERROR" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_strerror \- libmemcached Documentation . diff --git a/docs/man/memcached_touch.3 b/docs/man/memcached_touch.3 index 1f1a4ebf..2fb76464 100644 --- a/docs/man/memcached_touch.3 +++ b/docs/man/memcached_touch.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_TOUCH" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_TOUCH" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_touch \- libmemcached Documentation . diff --git a/docs/man/memcached_touch_by_key.3 b/docs/man/memcached_touch_by_key.3 index d5da5bc9..37c0da9b 100644 --- a/docs/man/memcached_touch_by_key.3 +++ b/docs/man/memcached_touch_by_key.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_TOUCH_BY_KEY" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_TOUCH_BY_KEY" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_touch_by_key \- libmemcached Documentation . diff --git a/docs/man/memcached_user_data.3 b/docs/man/memcached_user_data.3 index 7eb630af..46bd3830 100644 --- a/docs/man/memcached_user_data.3 +++ b/docs/man/memcached_user_data.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_USER_DATA" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_USER_DATA" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_user_data \- libmemcached Documentation . diff --git a/docs/man/memcached_verbosity.3 b/docs/man/memcached_verbosity.3 index 574ad75e..55308b3c 100644 --- a/docs/man/memcached_verbosity.3 +++ b/docs/man/memcached_verbosity.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_VERBOSITY" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_VERBOSITY" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_verbosity \- libmemcached Documentation . diff --git a/docs/man/memcached_version.3 b/docs/man/memcached_version.3 index ff89b197..330bf930 100644 --- a/docs/man/memcached_version.3 +++ b/docs/man/memcached_version.3 @@ -1,4 +1,4 @@ -.TH "MEMCACHED_VERSION" "3" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCACHED_VERSION" "3" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcached_version \- libmemcached Documentation . diff --git a/docs/man/memcapable.1 b/docs/man/memcapable.1 index ba39649b..d9e6f296 100644 --- a/docs/man/memcapable.1 +++ b/docs/man/memcapable.1 @@ -1,4 +1,4 @@ -.TH "MEMCAPABLE" "1" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCAPABLE" "1" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcapable \- libmemcached Documentation . diff --git a/docs/man/memcat.1 b/docs/man/memcat.1 index b3418059..72a829b8 100644 --- a/docs/man/memcat.1 +++ b/docs/man/memcat.1 @@ -1,4 +1,4 @@ -.TH "MEMCAT" "1" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCAT" "1" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcat \- libmemcached Documentation . diff --git a/docs/man/memcp.1 b/docs/man/memcp.1 index 93c4ff02..7e04129f 100644 --- a/docs/man/memcp.1 +++ b/docs/man/memcp.1 @@ -1,4 +1,4 @@ -.TH "MEMCP" "1" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMCP" "1" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memcp \- libmemcached Documentation . diff --git a/docs/man/memdump.1 b/docs/man/memdump.1 index 9d26a0e9..39c87fe4 100644 --- a/docs/man/memdump.1 +++ b/docs/man/memdump.1 @@ -1,4 +1,4 @@ -.TH "MEMDUMP" "1" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMDUMP" "1" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memdump \- libmemcached Documentation . diff --git a/docs/man/memerror.1 b/docs/man/memerror.1 index bb9f5cec..7bcdd7e8 100644 --- a/docs/man/memerror.1 +++ b/docs/man/memerror.1 @@ -1,4 +1,4 @@ -.TH "MEMERROR" "1" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMERROR" "1" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memerror \- libmemcached Documentation . diff --git a/docs/man/memexist.1 b/docs/man/memexist.1 index 1ae6ff43..8ff5077f 100644 --- a/docs/man/memexist.1 +++ b/docs/man/memexist.1 @@ -1,4 +1,4 @@ -.TH "MEMEXIST" "1" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMEXIST" "1" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memexist \- libmemcached Documentation . diff --git a/docs/man/memflush.1 b/docs/man/memflush.1 index 1681031e..1235cb47 100644 --- a/docs/man/memflush.1 +++ b/docs/man/memflush.1 @@ -1,4 +1,4 @@ -.TH "MEMFLUSH" "1" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMFLUSH" "1" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memflush \- libmemcached Documentation . diff --git a/docs/man/memparse.1 b/docs/man/memparse.1 index 314a0c5f..9443de39 100644 --- a/docs/man/memparse.1 +++ b/docs/man/memparse.1 @@ -1,4 +1,4 @@ -.TH "MEMPARSE" "1" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMPARSE" "1" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memparse \- libmemcached Documentation . diff --git a/docs/man/memping.1 b/docs/man/memping.1 index 6a266f52..840f2c9c 100644 --- a/docs/man/memping.1 +++ b/docs/man/memping.1 @@ -1,4 +1,4 @@ -.TH "MEMPING" "1" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMPING" "1" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memping \- libmemcached Documentation . diff --git a/docs/man/memrm.1 b/docs/man/memrm.1 index cf51f6a6..23551d46 100644 --- a/docs/man/memrm.1 +++ b/docs/man/memrm.1 @@ -1,4 +1,4 @@ -.TH "MEMRM" "1" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMRM" "1" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memrm \- libmemcached Documentation . diff --git a/docs/man/memslap.1 b/docs/man/memslap.1 index 812a25cb..e7557441 100644 --- a/docs/man/memslap.1 +++ b/docs/man/memslap.1 @@ -1,4 +1,4 @@ -.TH "MEMSLAP" "1" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMSLAP" "1" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memslap \- libmemcached Documentation . diff --git a/docs/man/memstat.1 b/docs/man/memstat.1 index cc6721a6..c46e82a6 100644 --- a/docs/man/memstat.1 +++ b/docs/man/memstat.1 @@ -1,4 +1,4 @@ -.TH "MEMSTAT" "1" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMSTAT" "1" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memstat \- libmemcached Documentation . diff --git a/docs/man/memtouch.1 b/docs/man/memtouch.1 index 7356331a..0372ea2f 100644 --- a/docs/man/memtouch.1 +++ b/docs/man/memtouch.1 @@ -1,4 +1,4 @@ -.TH "MEMTOUCH" "1" "July 31, 2012" "1.0.10" "libmemcached" +.TH "MEMTOUCH" "1" "August 02, 2012" "1.0.10" "libmemcached" .SH NAME memtouch \- libmemcached Documentation . diff --git a/example/t/memcached_light.cc b/example/t/memcached_light.cc index 9158b142..e76841a1 100644 --- a/example/t/memcached_light.cc +++ b/example/t/memcached_light.cc @@ -238,7 +238,7 @@ static bool world_destroy(void *object) } -void get_world(Framework *world) +void get_world(libtest::Framework* world) { world->create(world_create); world->destroy(world_destroy); diff --git a/libmemcached/connect.cc b/libmemcached/connect.cc index 5a5d899d..1ace3fd8 100644 --- a/libmemcached/connect.cc +++ b/libmemcached/connect.cc @@ -259,6 +259,7 @@ static void set_socket_options(org::libmemcached::Instance* server) int error= setsockopt(server->fd, SOL_SOCKET, SO_SNDTIMEO, &waittime, (socklen_t)sizeof(struct timeval)); + (void)(error); assert(error == 0); } #endif @@ -273,6 +274,7 @@ static void set_socket_options(org::libmemcached::Instance* server) int error= setsockopt(server->fd, SOL_SOCKET, SO_RCVTIMEO, &waittime, (socklen_t)sizeof(struct timeval)); + (void)(error); assert(error == 0); } #endif @@ -300,6 +302,7 @@ static void set_socket_options(org::libmemcached::Instance* server) linger.l_linger= 0; /* By default on close() just drop the socket */ int error= setsockopt(server->fd, SOL_SOCKET, SO_LINGER, &linger, (socklen_t)sizeof(struct linger)); + (void)(error); assert(error == 0); } @@ -309,6 +312,7 @@ static void set_socket_options(org::libmemcached::Instance* server) int error= setsockopt(server->fd, IPPROTO_TCP, TCP_NODELAY, &flag, (socklen_t)sizeof(int)); + (void)(error); assert(error == 0); } @@ -318,6 +322,7 @@ static void set_socket_options(org::libmemcached::Instance* server) int error= setsockopt(server->fd, SOL_SOCKET, SO_KEEPALIVE, &flag, (socklen_t)sizeof(int)); + (void)(error); assert(error == 0); } @@ -326,6 +331,7 @@ static void set_socket_options(org::libmemcached::Instance* server) { int error= setsockopt(server->fd, IPPROTO_TCP, TCP_KEEPIDLE, &server->root->tcp_keepidle, (socklen_t)sizeof(int)); + (void)(error); assert(error == 0); } #endif @@ -334,6 +340,7 @@ static void set_socket_options(org::libmemcached::Instance* server) { int error= setsockopt(server->fd, SOL_SOCKET, SO_SNDBUF, &server->root->send_size, (socklen_t)sizeof(int)); + (void)(error); assert(error == 0); } @@ -341,6 +348,7 @@ static void set_socket_options(org::libmemcached::Instance* server) { int error= setsockopt(server->fd, SOL_SOCKET, SO_RCVBUF, &server->root->recv_size, (socklen_t)sizeof(int)); + (void)(error); assert(error == 0); } diff --git a/libtest/cmdline.cc b/libtest/cmdline.cc index 94d4cce4..8cb76252 100644 --- a/libtest/cmdline.cc +++ b/libtest/cmdline.cc @@ -53,6 +53,8 @@ using namespace libtest; #include #include +#include + #ifndef __USE_GNU static char **environ= NULL; #endif @@ -80,13 +82,15 @@ extern "C" { namespace { - std::string print_argv(char * * & built_argv, const size_t& argc) + std::string print_argv(libtest::vchar_ptr_t& built_argv) { std::stringstream arg_buffer; - for (size_t x= 0; x < argc; ++x) + for (vchar_ptr_t::iterator iter= built_argv.begin(); + iter == built_argv.end(); + iter++) { - arg_buffer << built_argv[x] << " "; + arg_buffer << *iter << " "; } return arg_buffer.str(); @@ -134,7 +138,6 @@ Application::Application(const std::string& arg, const bool _use_libtool_arg) : stdin_fd(STDIN_FILENO), stdout_fd(STDOUT_FILENO), stderr_fd(STDERR_FILENO), - built_argv(NULL), _pid(-1) { if (_use_libtool) @@ -249,13 +252,14 @@ Application::error_t Application::run(const char *args[]) } else { + if (_use_libtool) { - spawn_ret= posix_spawn(&_pid, built_argv[0], &file_actions, &spawnattr, built_argv, NULL); + spawn_ret= posix_spawn(&_pid, built_argv[0], &file_actions, &spawnattr, &built_argv[0], NULL); } else { - spawn_ret= posix_spawnp(&_pid, built_argv[0], &file_actions, &spawnattr, built_argv, NULL); + spawn_ret= posix_spawnp(&_pid, built_argv[0], &file_actions, &spawnattr, &built_argv[0], NULL); } } @@ -458,6 +462,66 @@ Application::error_t Application::wait(bool nohang) return exit_code; } +Application::error_t Application::join() +{ + if (_pid == -1) + { + return Application::INVALID; + } + + slurp(); + + error_t exit_code= FAILURE; + { + int status= 0; + pid_t waited_pid; + do { + waited_pid= waitpid(_pid, &status, 0); + } while (waited_pid == -1 and (errno == EINTR or errno == EAGAIN)); + + if (waited_pid == -1) + { + switch (errno) + { + case ECHILD: + exit_code= Application::SUCCESS; + break; + + case EINTR: + break; + + default: + Error << "Error occured while waitpid(" << strerror(errno) << ") on pid " << int(_pid); + break; + } + } + else if (waited_pid == 0) + { + exit_code= Application::SUCCESS; + } + else + { + if (waited_pid != _pid) + { + throw libtest::fatal(LIBYATL_DEFAULT_PARAM, "Pid mismatch, %d != %d", int(waited_pid), int(_pid)); + } + + exit_code= int_to_error_t(exited_successfully(status)); + } + } + + slurp(); + +#if 0 + if (exit_code == Application::INVALID) + { + Error << print_argv(built_argv, _argc); + } +#endif + + return exit_code; +} + void Application::add_long_option(const std::string& name, const std::string& option_value) { std::string arg(name); @@ -526,7 +590,7 @@ bool Application::Pipe::read(libtest::vchar_t& arg) data_was_read= true; arg.reserve(read_length +1); - for (size_t x= 0; x < read_length; ++x) + for (size_t x= 0; x < size_t(read_length); ++x) { arg.push_back(buffer[x]); } @@ -640,61 +704,11 @@ void Application::Pipe::close(const close_t& arg) void Application::create_argv(const char *args[]) { delete_argv(); - fatal_assert(_argc == 0); - - if (_use_libtool) - { - _argc+= 2; // +2 for libtool --mode=execute - } - - _argc+= 1; // For the command - - /* - valgrind --error-exitcode=1 --leak-check=yes --show-reachable=yes --track-fds=yes --track-origin=yes --malloc-fill=A5 --free-fill=DE --log-file= - */ - if (_use_valgrind) - { - _argc+= 8; - } - else if (_use_ptrcheck) - { - /* - valgrind --error-exitcode=1 --tool=exp-ptrcheck --log-file= - */ - _argc+= 4; - } - else if (_use_gdb) // gdb - { - _argc+= 1; - } - - for (Options::const_iterator iter= _options.begin(); iter != _options.end(); ++iter) - { - _argc++; - if ((*iter).second.empty() == false) - { - _argc++; - } - } - - if (args) - { - for (const char **ptr= args; *ptr; ++ptr) - { - _argc++; - } - } - - _argc+= 1; // for the NULL - - built_argv= new char * [_argc]; - - size_t x= 0; if (_use_libtool) { assert(libtool()); - built_argv[x++]= strdup(libtool()); - built_argv[x++]= strdup("--mode=execute"); + built_argv.push_back(strdup(libtool())); + built_argv.push_back(strdup("--mode=execute")); } if (_use_valgrind) @@ -702,51 +716,50 @@ void Application::create_argv(const char *args[]) /* valgrind --error-exitcode=1 --leak-check=yes --show-reachable=yes --track-fds=yes --malloc-fill=A5 --free-fill=DE */ - built_argv[x++]= strdup("valgrind"); - built_argv[x++]= strdup("--error-exitcode=1"); - built_argv[x++]= strdup("--leak-check=yes"); - built_argv[x++]= strdup("--show-reachable=yes"); - built_argv[x++]= strdup("--track-fds=yes"); + built_argv.push_back(strdup("valgrind")); + built_argv.push_back(strdup("--error-exitcode=1")); + built_argv.push_back(strdup("--leak-check=yes")); + built_argv.push_back(strdup("--show-reachable=yes")); + built_argv.push_back(strdup("--track-fds=yes")); #if 0 built_argv[x++]= strdup("--track-origin=yes"); #endif - built_argv[x++]= strdup("--malloc-fill=A5"); - built_argv[x++]= strdup("--free-fill=DE"); + built_argv.push_back(strdup("--malloc-fill=A5")); + built_argv.push_back(strdup("--free-fill=DE")); std::string log_file= create_tmpfile("valgrind"); char buffer[1024]; int length= snprintf(buffer, sizeof(buffer), "--log-file=%s", log_file.c_str()); - fatal_assert(length > 0 and length < sizeof(buffer)); - built_argv[x++]= strdup(buffer); + fatal_assert(length > 0 and size_t(length) < sizeof(buffer)); + built_argv.push_back(strdup(buffer)); } else if (_use_ptrcheck) { /* valgrind --error-exitcode=1 --tool=exp-ptrcheck --log-file= */ - built_argv[x++]= strdup("valgrind"); - built_argv[x++]= strdup("--error-exitcode=1"); - built_argv[x++]= strdup("--tool=exp-ptrcheck"); - _argc+= 4; + built_argv.push_back(strdup("valgrind")); + built_argv.push_back(strdup("--error-exitcode=1")); + built_argv.push_back(strdup("--tool=exp-ptrcheck")); std::string log_file= create_tmpfile("ptrcheck"); char buffer[1024]; int length= snprintf(buffer, sizeof(buffer), "--log-file=%s", log_file.c_str()); - fatal_assert(length > 0 and length < sizeof(buffer)); - built_argv[x++]= strdup(buffer); + fatal_assert(length > 0 and size_t(length) < sizeof(buffer)); + built_argv.push_back(strdup(buffer)); } else if (_use_gdb) { - built_argv[x++]= strdup("gdb"); + built_argv.push_back(strdup("gdb")); } - built_argv[x++]= strdup(_exectuble_with_path.c_str()); + built_argv.push_back(strdup(_exectuble_with_path.c_str())); for (Options::const_iterator iter= _options.begin(); iter != _options.end(); ++iter) { - built_argv[x++]= strdup((*iter).first.c_str()); + built_argv.push_back(strdup((*iter).first.c_str())); if ((*iter).second.empty() == false) { - built_argv[x++]= strdup((*iter).second.c_str()); + built_argv.push_back(strdup((*iter).second.c_str())); } } @@ -754,16 +767,15 @@ void Application::create_argv(const char *args[]) { for (const char **ptr= args; *ptr; ++ptr) { - built_argv[x++]= strdup(*ptr); + built_argv.push_back(strdup(*ptr)); } } - built_argv[x++]= NULL; - fatal_assert(x == _argc); + built_argv.push_back(NULL); } std::string Application::print() { - return print_argv(built_argv, _argc); + return print_argv(built_argv); } std::string Application::arguments() @@ -780,21 +792,21 @@ std::string Application::arguments() return arg_buffer.str(); } -void Application::delete_argv() +struct DeleteFromVector { - if (built_argv) - { - for (size_t x= 0; x < _argc; ++x) + template + void operator() ( T* ptr) const { - if (built_argv[x]) - { - ::free(built_argv[x]); - } + free(ptr); } - delete[] built_argv; - built_argv= NULL; - _argc= 0; - } +}; + +void Application::delete_argv() +{ + std::for_each(built_argv.begin(), built_argv.end(), DeleteFromVector()); + + built_argv.clear(); + _argc= 0; } @@ -809,7 +821,7 @@ int exec_cmdline(const std::string& command, const char *args[], bool use_libtoo return int(ret); } - return int(app.wait(false)); + return int(app.join()); } const char *gearmand_binary() diff --git a/libtest/cmdline.h b/libtest/cmdline.h index 9dd9f813..46f7ad78 100644 --- a/libtest/cmdline.h +++ b/libtest/cmdline.h @@ -56,6 +56,26 @@ public: INVALID= 127 }; + static const char* toString(error_t arg) + { + switch (arg) + { + case Application::SUCCESS: + return "EXIT_SUCCESS"; + + case Application::FAILURE: + return "EXIT_FAILURE"; + + case Application::INVALID: + return "127"; + + default: + break; + } + + return "EXIT_UNKNOWN"; + } + class Pipe { public: Pipe(int); @@ -92,6 +112,7 @@ public: void add_long_option(const std::string& option_name, const std::string& option_value); error_t run(const char *args[]= NULL); error_t wait(bool nohang= true); + Application::error_t join(); libtest::vchar_t stdout_result() const { @@ -176,7 +197,7 @@ private: Pipe stdin_fd; Pipe stdout_fd; Pipe stderr_fd; - char * * built_argv; + libtest::vchar_ptr_t built_argv; pid_t _pid; libtest::vchar_t _stdout_buffer; libtest::vchar_t _stderr_buffer; @@ -184,25 +205,7 @@ private: static inline std::ostream& operator<<(std::ostream& output, const enum Application::error_t &arg) { - switch (arg) - { - case Application::SUCCESS: - output << "EXIT_SUCCESS"; - break; - - case Application::FAILURE: - output << "EXIT_FAILURE"; - break; - - case Application::INVALID: - output << "127"; - break; - - default: - output << "EXIT_UNKNOWN"; - } - - return output; + return output << Application::toString(arg); } int exec_cmdline(const std::string& executable, const char *args[], bool use_libtool= false); diff --git a/libtest/collection.cc b/libtest/collection.cc index 3f85d0fe..717847eb 100644 --- a/libtest/collection.cc +++ b/libtest/collection.cc @@ -38,7 +38,7 @@ #include -static test_return_t runner_code(Framework* frame, +static test_return_t runner_code(libtest::Framework* frame, test_st* run, libtest::Timer& _timer) { // Runner Code @@ -84,21 +84,22 @@ Collection::Collection(Framework* frame_arg, _success(0), _skipped(0), _failed(0), - _total(0) + _total(0), + _formatter(_name) { fatal_assert(arg); } test_return_t Collection::exec() { - Out << "Collection: " << _name; - if (test_success(_frame->runner()->pre(_pre, _frame->creators_ptr()))) { for (test_st *run= _tests; run->name; run++) { + formatter()->push_testcase(run->name); if (_frame->match(run->name)) { + formatter()->skipped(); continue; } _total++; @@ -112,6 +113,7 @@ test_return_t Collection::exec() { Error << "frame->runner()->flush(creators_ptr)"; _skipped++; + formatter()->skipped(); continue; } } @@ -122,28 +124,25 @@ test_return_t Collection::exec() { stream::cerr(e.file(), e.line(), e.func()) << e.what(); _failed++; + formatter()->failed(); throw; } switch (return_code) { case TEST_SUCCESS: - Out << "\tTesting " - << run->name - << "\t\t\t\t\t" - << _timer - << " [ " << test_strerror(return_code) << " ]"; _success++; + formatter()->success(_timer); break; case TEST_FAILURE: _failed++; - Out << "\tTesting " << run->name << "\t\t\t\t\t" << "[ " << test_strerror(return_code) << " ]"; + formatter()->failed(); break; case TEST_SKIPPED: _skipped++; - Out << "\tTesting " << run->name << "\t\t\t\t\t" << "[ " << test_strerror(return_code) << " ]"; + formatter()->skipped(); break; default: diff --git a/libtest/collection.h b/libtest/collection.h index 91c76a6d..bc879e30 100644 --- a/libtest/collection.h +++ b/libtest/collection.h @@ -36,9 +36,12 @@ #pragma once +#include + #include -class Framework; +namespace { class Framework; } + /** A structure which describes a collection of test cases. @@ -54,13 +57,13 @@ namespace libtest { class Collection { public: - Collection(Framework*, collection_st*); + Collection(libtest::Framework*, collection_st*); test_return_t exec(); const char* name() { - return _name; + return _name.c_str(); } uint32_t success() @@ -83,17 +86,23 @@ public: return _total; } + libtest::Formatter* formatter() + { + return &_formatter; + } + private: - const char *_name; + std::string _name; test_callback_fn *_pre; test_callback_fn *_post; struct test_st *_tests; - Framework* _frame; + libtest::Framework* _frame; uint32_t _success; uint32_t _skipped; uint32_t _failed; uint32_t _total; libtest::Timer _timer; + libtest::Formatter _formatter; }; } // namespace libtest diff --git a/libtest/common.h b/libtest/common.h index 498baf34..4d8d5724 100644 --- a/libtest/common.h +++ b/libtest/common.h @@ -78,4 +78,5 @@ #include #include #include +#include diff --git a/libtest/drizzled.cc b/libtest/drizzled.cc index 70eca026..49fe2969 100644 --- a/libtest/drizzled.cc +++ b/libtest/drizzled.cc @@ -70,6 +70,7 @@ using namespace libtest; namespace libtest { bool ping_drizzled(const in_port_t _port) { + (void)(_port); #if defined(HAVE_LIBDRIZZLE) && HAVE_LIBDRIZZLE { drizzle_st *drizzle= drizzle_create(NULL); @@ -148,7 +149,7 @@ public: return "drizzled"; }; - void log_file_option(Application& app, const std::string& arg) + void log_file_option(Application&, const std::string&) { } diff --git a/libtest/fatal.cc b/libtest/fatal.cc index c61b5cfb..1187292b 100644 --- a/libtest/fatal.cc +++ b/libtest/fatal.cc @@ -86,7 +86,7 @@ void fatal::increment_disabled_counter() } disconnected::disconnected(const char *file_arg, int line_arg, const char *func_arg, - const char *instance, const in_port_t port, + const std::string& instance, const in_port_t port, const char *format, ...) : std::runtime_error(func_arg), _port(port), @@ -94,14 +94,13 @@ disconnected::disconnected(const char *file_arg, int line_arg, const char *func_ _file(file_arg), _func(func_arg) { - strncpy(_instance, instance, sizeof(_instance)); va_list args; va_start(args, format); char last_error[BUFSIZ]; (void)vsnprintf(last_error, sizeof(last_error), format, args); va_end(args); - snprintf(_error_message, sizeof(_error_message), "%s", last_error); + snprintf(_error_message, sizeof(_error_message), "%s:%u %s", instance.c_str(), uint32_t(port), last_error); } } // namespace libtest diff --git a/libtest/fatal.hpp b/libtest/fatal.hpp index 7a8ce516..bb8cc938 100644 --- a/libtest/fatal.hpp +++ b/libtest/fatal.hpp @@ -101,7 +101,7 @@ private: class disconnected : std::runtime_error { public: - disconnected(const char *file, int line, const char *func, const char *instance, const in_port_t port, const char *format, ...); + disconnected(const char *file, int line, const char *func, const std::string&, const in_port_t port, const char *format, ...); const char* what() const throw() { diff --git a/libtest/framework.cc b/libtest/framework.cc index daea4f4e..327c2c0d 100644 --- a/libtest/framework.cc +++ b/libtest/framework.cc @@ -43,12 +43,12 @@ #include #include -using namespace libtest; +namespace libtest { Framework::Framework(libtest::SignalThread& signal, + const std::string& name_, const std::string& only_run_arg, const std::string& wildcard_arg) : - _collections(NULL), _total(0), _success(0), _skipped(0), @@ -61,11 +61,15 @@ Framework::Framework(libtest::SignalThread& signal, _creators_ptr(NULL), _signal(signal), _only_run(only_run_arg), - _wildcard(wildcard_arg) + _wildcard(wildcard_arg), + _name(name_) { get_world(this); +} - for (collection_st *next= _collections; next and next->name; next++) +void Framework::collections(collection_st* collections_) +{ + for (collection_st *next= collections_; next and next->name; next++) { _collection.push_back(new Collection(this, next)); } @@ -148,9 +152,9 @@ void Framework::exec() _failed++; throw; } - - Outn(); } + + void xml(const std::string& testsuites_name, std::ostream& output); } uint32_t Framework::sum_total() @@ -226,3 +230,5 @@ test_return_t Framework::create() return rc; } + +} // namespace libtest diff --git a/libtest/framework.h b/libtest/framework.h index da1d5b98..f6dfc94a 100644 --- a/libtest/framework.h +++ b/libtest/framework.h @@ -46,12 +46,22 @@ #include +namespace { class Collection; } +typedef std::vector Suites; + +namespace libtest { + class Framework { public: public: test_return_t create(); + const std::string& name() const + { + return _name; + } + void create(test_callback_create_fn* arg) { _create= arg; @@ -62,10 +72,7 @@ public: _destroy= arg; } - void collections(collection_st* arg) - { - _collections= arg; - } + void collections(collection_st* arg); void set_on_error(test_callback_error_fn *arg) { @@ -100,11 +107,10 @@ public: libtest::Collection& collection(); - Framework(libtest::SignalThread&, const std::string&); - virtual ~Framework(); Framework(libtest::SignalThread&, + const std::string&, const std::string&, const std::string&); @@ -150,11 +156,14 @@ public: return _failed; } + Suites& suites() + { + return _collection; + } + private: Framework& operator=(const Framework&); - collection_st *_collections; - uint32_t _total; uint32_t _success; uint32_t _skipped; @@ -179,8 +188,11 @@ private: bool _socket; void *_creators_ptr; unsigned long int _servers_to_run; - std::vector _collection; + Suites _collection; libtest::SignalThread& _signal; std::string _only_run; std::string _wildcard; + std::string _name; }; + +} // namespace libtest diff --git a/libtest/gearmand.cc b/libtest/gearmand.cc index e25cdf74..f6dbdfce 100644 --- a/libtest/gearmand.cc +++ b/libtest/gearmand.cc @@ -93,7 +93,7 @@ public: if (out_of_ban_killed() == false) { - Error << hostname().c_str() << ":" << port() << " was " << gearman_strerror(rc) << " extended: " << gearman_client_error(client); + Error << hostname().c_str() << ":" << port() << " " << gearman_client_error(client); } } else diff --git a/libtest/get.h b/libtest/get.h index b0d4801b..e21ac0a4 100644 --- a/libtest/get.h +++ b/libtest/get.h @@ -42,7 +42,7 @@ extern "C" { /* How we make all of this work :) */ LIBTEST_API - void get_world(Framework *world); + void get_world(libtest::Framework *world); #ifdef __cplusplus } diff --git a/libtest/has.cc b/libtest/has.cc index ba4bbfc6..accadf98 100644 --- a/libtest/has.cc +++ b/libtest/has.cc @@ -64,8 +64,10 @@ bool has_libdrizzle(void) bool has_postgres_support(void) { - if (getenv("POSTGES_IS_RUNNING_AND_SETUP")) + char *getenv_ptr; + if (bool((getenv_ptr= getenv("POSTGES_IS_RUNNING_AND_SETUP")))) { + (void)(getenv_ptr); if (HAVE_LIBPQ) { return true; @@ -80,11 +82,14 @@ bool has_gearmand() { if (HAVE_GEARMAND_BINARY) { +#if defined(HAVE_GEARMAND_BINARY) && HAVE_GEARMAND_BINARY std::stringstream arg_buffer; - if (getenv("PWD") and strcmp(MEMCACHED_BINARY, "gearmand/gearmand") == 0) + char *getenv_ptr; + if (bool((getenv_ptr= getenv("PWD"))) and + ((strcmp(GEARMAND_BINARY, "./gearmand/gearmand") == 0) or (strcmp(GEARMAND_BINARY, "gearmand/gearmand") == 0))) { - arg_buffer << getenv("PWD"); + arg_buffer << getenv_ptr; arg_buffer << "/"; } arg_buffer << GEARMAND_BINARY; @@ -93,6 +98,7 @@ bool has_gearmand() { return true; } +#endif } return false; @@ -100,6 +106,7 @@ bool has_gearmand() bool has_drizzled() { +#if defined(HAVE_DRIZZLED_BINARY) && HAVE_DRIZZLED_BINARY if (HAVE_DRIZZLED_BINARY) { if (access(DRIZZLED_BINARY, X_OK) == 0) @@ -107,12 +114,14 @@ bool has_drizzled() return true; } } +#endif return false; } bool has_mysqld() { +#if defined(HAVE_MYSQLD_BUILD) && HAVE_MYSQLD_BUILD if (HAVE_MYSQLD_BUILD) { if (access(MYSQLD_BINARY, X_OK) == 0) @@ -120,6 +129,7 @@ bool has_mysqld() return true; } } +#endif return false; } @@ -130,9 +140,11 @@ bool has_memcached() { std::stringstream arg_buffer; - if (getenv("PWD") and strcmp(MEMCACHED_BINARY, "memcached/memcached") == 0) + + char *getenv_ptr; + if (bool((getenv_ptr= getenv("PWD"))) and strcmp(MEMCACHED_BINARY, "memcached/memcached") == 0) { - arg_buffer << getenv("PWD"); + arg_buffer << getenv_ptr; arg_buffer << "/"; } arg_buffer << MEMCACHED_BINARY; diff --git a/libtest/http.cc b/libtest/http.cc index d7faf19d..9933e12f 100644 --- a/libtest/http.cc +++ b/libtest/http.cc @@ -96,6 +96,8 @@ extern "C" size_t static void init(CURL *curl, const std::string& url) { + (void)curl; + (void)url; if (HAVE_LIBCURL) { #if defined(HAVE_LIBCURL) && HAVE_LIBCURL diff --git a/libtest/http.hpp b/libtest/http.hpp index 240104b3..68278218 100644 --- a/libtest/http.hpp +++ b/libtest/http.hpp @@ -36,6 +36,8 @@ #pragma once +#include + namespace libtest { namespace http { diff --git a/libtest/include.am b/libtest/include.am index 7f6b6a3f..28c89c59 100644 --- a/libtest/include.am +++ b/libtest/include.am @@ -9,6 +9,7 @@ VALGRIND_EXEC_COMMAND= $(LIBTOOL_COMMAND) valgrind --error-exitcode=1 --leak-che VALGRIND_COMMAND= TESTS_ENVIRONMENT="valgrind" $(VALGRIND_EXEC_COMMAND) HELGRIND_COMMAND= $(LIBTOOL_COMMAND) valgrind --tool=helgrind --read-var-info=yes --error-exitcode=1 --read-var-info=yes DRD_COMMAND= $(LIBTOOL_COMMAND) valgrind --tool=drd +MASSIF_COMMAND= $(LIBTOOL_COMMAND) valgrind --tool=massif GDB_COMMAND= $(LIBTOOL_COMMAND) gdb -f -x libtest/run.gdb PTRCHECK_COMMAND= $(LIBTOOL_COMMAND) valgrind --tool=exp-ptrcheck --error-exitcode=1 @@ -38,6 +39,7 @@ CLEANFILES+= tmp_chroot/var/drizzle/* CLEANFILES+= tmp_chroot/var/log/* CLEANFILES+= tmp_chroot/var/run/* CLEANFILES+= tmp_chroot/var/tmp/* +CLEANFILES+= tmp_chroot/*.xml BUILT_SOURCES+= libtest/version.h @@ -45,6 +47,7 @@ BUILT_SOURCES+= libtest/version.h distclean-libtest-check: -rm -rf tmp_chroot +noinst_HEADERS+= libtest/formatter.hpp noinst_HEADERS+= libtest/timer.hpp noinst_HEADERS+= libtest/binaries.h noinst_HEADERS+= libtest/cpu.hpp @@ -106,6 +109,7 @@ libtest_libtest_la_SOURCES+= libtest/core.cc libtest_libtest_la_SOURCES+= libtest/cpu.cc libtest_libtest_la_SOURCES+= libtest/dream.cc libtest_libtest_la_SOURCES+= libtest/fatal.cc +libtest_libtest_la_SOURCES+= libtest/formatter.cc libtest_libtest_la_SOURCES+= libtest/framework.cc libtest_libtest_la_SOURCES+= libtest/has.cc libtest_libtest_la_SOURCES+= libtest/drizzled.cc @@ -228,7 +232,7 @@ test-unittest: libtest/unittest @libtest/unittest valgrind-unittest: libtest/unittest - @$(VALGRIND_COMMAND) libtest/unittest TESTS_ENVIRONMENT="valgrind" + @$(VALGRIND_COMMAND) libtest/unittest gdb-unittest: libtest/unittest @$(GDB_COMMAND) libtest/unittest diff --git a/libtest/main.cc b/libtest/main.cc index 453d2966..6721b5aa 100644 --- a/libtest/main.cc +++ b/libtest/main.cc @@ -43,6 +43,7 @@ #include #include #include +#include #include #include #include @@ -58,7 +59,7 @@ using namespace libtest; -static void stats_print(Framework *frame) +static void stats_print(libtest::Framework *frame) { if (frame->failed() == 0 and frame->success() == 0) { @@ -87,6 +88,23 @@ int main(int argc, char *argv[]) bool opt_quiet= false; std::string collection_to_run; std::string wildcard; + std::string binary_name; + + const char *just_filename= rindex(argv[0], '/'); + if (just_filename) + { + just_filename++; + } + else + { + just_filename= argv[0]; + } + + if (just_filename[0] == 'l' and just_filename[1] == 't' and just_filename[2] == '-') + { + just_filename+= 3; + } + binary_name.append(just_filename); /* Valgrind does not currently work reliably, or sometimes at all, on OSX @@ -261,7 +279,7 @@ int main(int argc, char *argv[]) return EXIT_FAILURE; } - std::auto_ptr frame(new Framework(signal, collection_to_run, wildcard)); + std::auto_ptr frame(new libtest::Framework(signal, binary_name, collection_to_run, wildcard)); // Run create(), bail on error. { @@ -303,11 +321,23 @@ int main(int argc, char *argv[]) } else if (frame->success() and (frame->failed() == 0)) { + Out; Out << "All tests completed successfully."; } stats_print(frame.get()); + std::ofstream xml_file; + std::string file_name; + if (getenv("LIBTEST_TEMP")) + { + file_name.append(getenv("LIBTEST_TEMP")); + } + file_name.append(frame->name()); + file_name.append(".xml"); + xml_file.open(file_name.c_str(), std::ios::trunc); + libtest::Formatter::xml(*frame, xml_file); + Outn(); // Generate a blank to break up the messages if make check/test has been run } while (exit_code == EXIT_SUCCESS and --opt_repeat); } diff --git a/libtest/memcached.cc b/libtest/memcached.cc index d92944f6..37a3102e 100644 --- a/libtest/memcached.cc +++ b/libtest/memcached.cc @@ -375,7 +375,7 @@ bool Memcached::build(size_t argc, const char *argv[]) add_option(sasl()); } - for (int x= 0 ; x < argc ; x++) + for (size_t x= 0 ; x < argc ; x++) { add_option(argv[x]); } diff --git a/libtest/port.h b/libtest/port.h index bded6abc..55cef532 100644 --- a/libtest/port.h +++ b/libtest/port.h @@ -40,6 +40,8 @@ #pragma once +#define LIBTEST_FAIL_PORT 23 + namespace libtest { LIBTEST_API diff --git a/libtest/server.cc b/libtest/server.cc index 61f8e983..135aa0f0 100644 --- a/libtest/server.cc +++ b/libtest/server.cc @@ -178,6 +178,12 @@ bool Server::start() } #endif + if (port() == LIBTEST_FAIL_PORT) + { + throw libtest::disconnected(LIBYATL_DEFAULT_PARAM, + hostname(), port(), "Called failure"); + } + if (getenv("YATL_PTRCHECK_SERVER")) { _app.use_ptrcheck(); @@ -189,15 +195,16 @@ bool Server::start() if (args(_app) == false) { - Error << "Could not build command()"; - return false; + throw libtest::disconnected(LIBYATL_DEFAULT_PARAM, + hostname(), port(), "Could not build command()"); } libtest::release_port(_port); Application::error_t ret; if (Application::SUCCESS != (ret= _app.run())) { - Error << "Application::run() " << ret; + throw libtest::disconnected(LIBYATL_DEFAULT_PARAM, + hostname(), port(), "Application::run() %s", libtest::Application::toString(ret)); return false; } _running= _app.print(); @@ -225,11 +232,12 @@ bool Server::start() char buf[PATH_MAX]; char *getcwd_buf= getcwd(buf, sizeof(buf)); - throw libtest::fatal(LIBYATL_DEFAULT_PARAM, - "Unable to open pidfile in %s for: %s stderr:%s", - getcwd_buf ? getcwd_buf : "", - _running.c_str(), - _app.stderr_c_str()); + throw libtest::disconnected(LIBYATL_DEFAULT_PARAM, + hostname(), port(), + "Unable to open pidfile in %s for: %s stderr:%s", + getcwd_buf ? getcwd_buf : "", + _running.c_str(), + _app.stderr_c_str()); } } } @@ -241,7 +249,7 @@ bool Server::start() uint32_t waited; uint32_t retry; - for (waited= 0, retry= 1; ; retry++, waited+= this_wait) + for (waited= 0, retry= 4; ; retry++, waited+= this_wait) { if ((pinged= ping()) == true) { @@ -265,40 +273,38 @@ bool Server::start() _app.slurp(); if (kill_file(pid_file()) == false) { - libtest::fatal err(LIBYATL_DEFAULT_PARAM, - "Failed to kill off server, waited: %u after startup occurred, when pinging failed: %.*s stderr:%.*s", - this_wait, - int(_running.size()), _running.c_str(), - int(_app.stderr_result_length()), _app.stderr_c_str()); - - stream::cerr(err.file(), err.line(), err.func()) << err.what(); + throw libtest::disconnected(LIBYATL_DEFAULT_PARAM, + hostname(), port(), + "Failed to kill off server, waited: %u after startup occurred, when pinging failed: %.*s stderr:%.*s", + this_wait, + int(_running.size()), _running.c_str(), + int(_app.stderr_result_length()), _app.stderr_c_str()); } else { - libtest::fatal err(LIBYATL_DEFAULT_PARAM, - "Failed native ping(), pid: %d was alive: %s waited: %u server started, having pid_file. exec: %.*s stderr:%.*s", - int(_app.pid()), - _app.check() ? "true" : "false", - this_wait, - int(_running.size()), _running.c_str(), - int(_app.stderr_result_length()), _app.stderr_c_str()); - - stream::cerr(err.file(), err.line(), err.func()) << err.what(); + throw libtest::disconnected(LIBYATL_DEFAULT_PARAM, + hostname(), port(), + "Failed native ping(), pid: %d was alive: %s waited: %u server started, having pid_file. exec: %.*s stderr:%.*s", + int(_app.pid()), + _app.check() ? "true" : "false", + this_wait, + int(_running.size()), _running.c_str(), + int(_app.stderr_result_length()), _app.stderr_c_str()); } } else { - libtest::fatal err(LIBYATL_DEFAULT_PARAM, - "Failed native ping(), pid: %d is alive: %s waited: %u server started. exec: %.*s stderr:%.*s", - int(_app.pid()), - _app.check() ? "true" : "false", - this_wait, - int(_running.size()), _running.c_str(), - int(_app.stderr_result_length()), _app.stderr_c_str()); - - stream::cerr(err.file(), err.line(), err.func()) << err.what(); + throw libtest::disconnected(LIBYATL_DEFAULT_PARAM, + hostname(), port(), + "Failed native ping(), pid: %d is alive: %s waited: %u server started. exec: %.*s stderr:%.*s", + int(_app.pid()), + _app.check() ? "true" : "false", + this_wait, + int(_running.size()), _running.c_str(), + int(_app.stderr_result_length()), _app.stderr_c_str()); } _running.clear(); + return false; } diff --git a/libtest/server_container.cc b/libtest/server_container.cc index fa98c739..13b89573 100644 --- a/libtest/server_container.cc +++ b/libtest/server_container.cc @@ -311,6 +311,12 @@ bool server_startup_st::start_server(const std::string& server_type, in_port_t t } } } + catch (libtest::disconnected err) + { + stream::cerr(err.file(), err.line(), err.func()) << err.what(); + delete server; + return false; + } catch (...) { delete server; diff --git a/libtest/skiptest.cc b/libtest/skiptest.cc index 354e2db1..dae33326 100644 --- a/libtest/skiptest.cc +++ b/libtest/skiptest.cc @@ -51,7 +51,7 @@ static void *world_create(server_startup_st&, test_return_t& rc) return NULL; } -void get_world(Framework *world) +void get_world(libtest::Framework *world) { world->create(world_create); } diff --git a/libtest/test.h b/libtest/test.h index 5c449ab0..78cdb4e4 100644 --- a/libtest/test.h +++ b/libtest/test.h @@ -170,7 +170,7 @@ do \ #define test_zero(__actual) \ do \ { \ - if (not libtest::_compare_zero(__FILE__, __LINE__, __func__, ((__actual)))) \ + if (libtest::_compare_zero(__FILE__, __LINE__, __func__, ((__actual))) == false) \ { \ libtest::create_core(); \ return TEST_FAILURE; \ diff --git a/libtest/unittest.cc b/libtest/unittest.cc index 3d85b77d..6b3efe95 100644 --- a/libtest/unittest.cc +++ b/libtest/unittest.cc @@ -270,7 +270,7 @@ static test_return_t drizzled_cycle_test(void *object) test_skip(true, has_drizzled()); - test_true(server_startup(*servers, "drizzled", get_free_port(), 0, NULL)); + test_skip(true, server_startup(*servers, "drizzled", get_free_port(), 0, NULL)); return TEST_SUCCESS; } @@ -286,11 +286,12 @@ static test_return_t gearmand_cycle_test(void *object) test_skip(true, has_gearmand()); - test_true(server_startup(*servers, "gearmand", get_free_port(), 0, NULL)); + test_skip(true, server_startup(*servers, "gearmand", get_free_port(), 0, NULL)); return TEST_SUCCESS; } +#if 0 static test_return_t memcached_light_cycle_TEST(void *object) { server_startup_st *servers= (server_startup_st*)object; @@ -302,6 +303,7 @@ static test_return_t memcached_light_cycle_TEST(void *object) return TEST_SUCCESS; } +#endif static test_return_t skip_shim(bool a, bool b) { @@ -309,7 +311,7 @@ static test_return_t skip_shim(bool a, bool b) return TEST_SUCCESS; } -static test_return_t test_skip_true_TEST(void *object) +static test_return_t test_skip_true_TEST(void*) { test_compare(true, true); test_compare(false, false); @@ -319,13 +321,23 @@ static test_return_t test_skip_true_TEST(void *object) return TEST_SUCCESS; } -static test_return_t test_skip_false_TEST(void *object) +static test_return_t test_skip_false_TEST(void*) { test_compare(TEST_SKIPPED, skip_shim(true, false)); test_compare(TEST_SKIPPED, skip_shim(false, true)); return TEST_SUCCESS; } +static test_return_t server_startup_fail_TEST(void *object) +{ + server_startup_st *servers= (server_startup_st*)object; + test_true(servers); + + test_compare(servers->start_server(testing_service, LIBTEST_FAIL_PORT, 0, NULL, true), false); + + return TEST_SUCCESS; +} + static test_return_t server_startup_TEST(void *object) { server_startup_st *servers= (server_startup_st*)object; @@ -359,6 +371,7 @@ static test_return_t socket_server_startup_TEST(void *object) return TEST_SUCCESS; } +#if 0 static test_return_t memcached_sasl_test(void *object) { server_startup_st *servers= (server_startup_st*)object; @@ -379,6 +392,7 @@ static test_return_t memcached_sasl_test(void *object) return TEST_SKIPPED; } +#endif static test_return_t application_true_BINARY(void *) { @@ -422,7 +436,7 @@ static test_return_t application_true_fubar_BINARY(void *) const char *args[]= { "--fubar", 0 }; test_compare(Application::SUCCESS, true_app.run(args)); test_compare(Application::SUCCESS, true_app.wait()); - test_compare(0, true_app.stdout_result().size()); + test_zero(true_app.stdout_result().size()); return TEST_SUCCESS; } @@ -442,7 +456,7 @@ static test_return_t application_doesnotexist_BINARY(void *) test_compare(Application::INVALID, true_app.wait(false)); #endif - test_compare(0, true_app.stdout_result().size()); + test_zero(true_app.stdout_result().size()); return TEST_SUCCESS; } @@ -454,7 +468,7 @@ static test_return_t application_true_fubar_eq_doh_BINARY(void *) const char *args[]= { "--fubar=doh", 0 }; test_compare(Application::SUCCESS, true_app.run(args)); test_compare(Application::SUCCESS, true_app.wait()); - test_compare(0, true_app.stdout_result().size()); + test_zero(true_app.stdout_result().size()); return TEST_SUCCESS; } @@ -467,7 +481,7 @@ static test_return_t application_true_fubar_eq_doh_option_BINARY(void *) test_compare(Application::SUCCESS, true_app.run()); test_compare(Application::SUCCESS, true_app.wait()); - test_compare(0, true_app.stdout_result().size()); + test_zero(true_app.stdout_result().size()); return TEST_SUCCESS; } @@ -547,7 +561,7 @@ static test_return_t application_echo_fubar_BINARY2(void *) true_app.add_option("fubar"); test_compare(Application::SUCCESS, true_app.run()); - test_compare(Application::SUCCESS, true_app.wait(false)); + test_compare(Application::SUCCESS, true_app.join()); libtest::vchar_t response; make_vector(response, test_literal_param("fubar\n")); @@ -766,7 +780,7 @@ static test_return_t create_tmpfile_TEST(void *) Application touch_app("touch"); const char *args[]= { tmp.c_str(), 0 }; test_compare(Application::SUCCESS, touch_app.run(args)); - test_compare(Application::SUCCESS, touch_app.wait(false)); + test_compare(Application::SUCCESS, touch_app.join()); test_compare(0, access(tmp.c_str(), R_OK)); test_compare(0, unlink(tmp.c_str())); @@ -795,6 +809,9 @@ static test_return_t check_for_gearman(void *) { test_skip(true, HAVE_LIBGEARMAN); test_skip(true, has_gearmand()); + + testing_service= "gearmand"; + return TEST_SUCCESS; } @@ -802,6 +819,9 @@ static test_return_t check_for_drizzle(void *) { test_skip(true, HAVE_LIBDRIZZLE); test_skip(true, has_drizzled()); + + testing_service= "drizzled"; + return TEST_SUCCESS; } @@ -817,6 +837,7 @@ test_st gearmand_tests[] ={ #endif {"gearmand startup-shutdown", 0, gearmand_cycle_test }, {"_compare(gearman_return_t)", 0, _compare_gearman_return_t_test }, + {"server_startup(fail)", 0, server_startup_fail_TEST }, {0, 0, 0} }; @@ -838,6 +859,7 @@ test_st memcached_TESTS[] ={ {"memcached startup-shutdown", 0, server_startup_TEST }, {"memcached(socket file) startup-shutdown", 0, socket_server_startup_TEST }, {"_compare(memcached_return_t)", 0, _compare_memcached_return_t_test }, + {"server_startup(fail)", 0, server_startup_fail_TEST }, {0, 0, 0} }; @@ -1007,7 +1029,7 @@ static void *world_create(server_startup_st& servers, test_return_t&) return &servers; } -void get_world(Framework *world) +void get_world(libtest::Framework *world) { world->collections(collection); world->create(world_create); diff --git a/tests/cycle.cc b/tests/cycle.cc index 679473ea..32df0da0 100644 --- a/tests/cycle.cc +++ b/tests/cycle.cc @@ -127,7 +127,7 @@ static void *world_create(server_startup_st& servers, test_return_t& error) return &servers; } -void get_world(Framework *world) +void get_world(libtest::Framework* world) { world->collections(collection); world->create(world_create); diff --git a/tests/failure.cc b/tests/failure.cc index 95c8fb6a..faea94e4 100644 --- a/tests/failure.cc +++ b/tests/failure.cc @@ -59,7 +59,7 @@ using namespace std; using namespace memcache; using namespace libtest; -Framework *global_framework= NULL; +libtest::Framework *global_framework= NULL; static test_return_t shutdown_servers(memcached_st *memc) { @@ -220,7 +220,7 @@ collection_st collection[] ={ #include "tests/libmemcached_world.h" -void get_world(Framework *world) +void get_world(libtest::Framework* world) { world->servers().set_servers_to_run(1); diff --git a/tests/hash_plus.cc b/tests/hash_plus.cc index 19c77c38..257a42ec 100644 --- a/tests/hash_plus.cc +++ b/tests/hash_plus.cc @@ -213,7 +213,7 @@ collection_st collection[] ={ {0, 0, 0, 0} }; -void get_world(Framework *world) +void get_world(libtest::Framework* world) { world->collections(collection); } diff --git a/tests/hashkit_functions.cc b/tests/hashkit_functions.cc index 4934b55b..b45be3ae 100644 --- a/tests/hashkit_functions.cc +++ b/tests/hashkit_functions.cc @@ -562,7 +562,7 @@ static bool world_destroy(void *object) return TEST_SUCCESS; } -void get_world(Framework *world) +void get_world(libtest::Framework* world) { world->collections(collection); world->create(world_create); diff --git a/tests/libmemcached-1.0/all_tests.cc b/tests/libmemcached-1.0/all_tests.cc index 8aeac4d9..aaa89c0a 100644 --- a/tests/libmemcached-1.0/all_tests.cc +++ b/tests/libmemcached-1.0/all_tests.cc @@ -71,7 +71,7 @@ #include -void get_world(Framework *world) +void get_world(libtest::Framework* world) { if (getenv("LIBMEMCACHED_SERVER_NUMBER")) { diff --git a/tests/libmemcached-1.0/all_tests_socket.cc b/tests/libmemcached-1.0/all_tests_socket.cc index 958873fb..47ab67eb 100644 --- a/tests/libmemcached-1.0/all_tests_socket.cc +++ b/tests/libmemcached-1.0/all_tests_socket.cc @@ -69,7 +69,7 @@ #include "tests/libmemcached_world_socket.h" -void get_world(Framework *world) +void get_world(libtest::Framework* world) { world->collections(collection); diff --git a/tests/libmemcached-1.0/atomsmasher.cc b/tests/libmemcached-1.0/atomsmasher.cc index e5d53b60..aad0961b 100644 --- a/tests/libmemcached-1.0/atomsmasher.cc +++ b/tests/libmemcached-1.0/atomsmasher.cc @@ -273,7 +273,7 @@ collection_st collection[] ={ #include "tests/libmemcached_world.h" -void get_world(Framework *world) +void get_world(libtest::Framework* world) { world->collections(collection); diff --git a/tests/libmemcached-1.0/internals.cc b/tests/libmemcached-1.0/internals.cc index 6e0232fc..89d51413 100644 --- a/tests/libmemcached-1.0/internals.cc +++ b/tests/libmemcached-1.0/internals.cc @@ -61,7 +61,7 @@ collection_st collection[] ={ {0, 0, 0, 0} }; -void get_world(Framework *frame) +void get_world(libtest::Framework* frame) { frame->collections(collection); } diff --git a/tests/libmemcached-1.0/plus.cpp b/tests/libmemcached-1.0/plus.cpp index 68f1d7e0..e7bfd836 100644 --- a/tests/libmemcached-1.0/plus.cpp +++ b/tests/libmemcached-1.0/plus.cpp @@ -322,7 +322,7 @@ collection_st collection[] ={ #define TEST_PORT_BASE MEMCACHED_DEFAULT_PORT +10 #include "tests/libmemcached_world.h" -void get_world(Framework *world) +void get_world(libtest::Framework* world) { world->collections(collection); diff --git a/tests/libmemcached-1.0/sasl.cc b/tests/libmemcached-1.0/sasl.cc index 0ae101f2..6dae4237 100644 --- a/tests/libmemcached-1.0/sasl.cc +++ b/tests/libmemcached-1.0/sasl.cc @@ -99,7 +99,7 @@ collection_st collection[] ={ #include "tests/libmemcached_world.h" -void get_world(Framework *world) +void get_world(libtest::Framework* world) { world->collections(collection); diff --git a/tests/mem_udp.cc b/tests/mem_udp.cc index 42dbcb69..ed657bf4 100644 --- a/tests/mem_udp.cc +++ b/tests/mem_udp.cc @@ -566,7 +566,7 @@ collection_st collection[] ={ #include "tests/libmemcached_world.h" -void get_world(Framework *world) +void get_world(libtest::Framework* world) { world->collections(collection); diff --git a/tests/memcapable.cc b/tests/memcapable.cc index 2723e7f6..93ad1860 100644 --- a/tests/memcapable.cc +++ b/tests/memcapable.cc @@ -115,14 +115,14 @@ static void *world_create(server_startup_st& servers, test_return_t& error) if (server_startup(servers, "memcached", libtest::default_port(), 0, NULL) == false) { - error= TEST_FAILURE; + error= TEST_SKIPPED; } return &servers; } -void get_world(Framework *world) +void get_world(libtest::Framework* world) { executable= "./clients/memcapable"; world->collections(collection); diff --git a/tests/memcat.cc b/tests/memcat.cc index f70da3be..d86213c0 100644 --- a/tests/memcat.cc +++ b/tests/memcat.cc @@ -141,7 +141,7 @@ static void *world_create(server_startup_st& servers, test_return_t& error) } -void get_world(Framework *world) +void get_world(libtest::Framework* world) { world->collections(collection); world->create(world_create); diff --git a/tests/memcp.cc b/tests/memcp.cc index 590f1af3..04c47f80 100644 --- a/tests/memcp.cc +++ b/tests/memcp.cc @@ -100,7 +100,7 @@ static void *world_create(server_startup_st& servers, test_return_t& error) } -void get_world(Framework *world) +void get_world(libtest::Framework* world) { world->collections(collection); world->create(world_create); diff --git a/tests/memdump.cc b/tests/memdump.cc index ac1619c3..6f9330a5 100644 --- a/tests/memdump.cc +++ b/tests/memdump.cc @@ -127,7 +127,7 @@ static void *world_create(server_startup_st& servers, test_return_t& error) } -void get_world(Framework *world) +void get_world(libtest::Framework* world) { world->collections(collection); world->create(world_create); diff --git a/tests/memerror.cc b/tests/memerror.cc index 1c893e11..76cc96c4 100644 --- a/tests/memerror.cc +++ b/tests/memerror.cc @@ -123,7 +123,7 @@ static void *world_create(server_startup_st&, test_return_t& error) } -void get_world(Framework *world) +void get_world(libtest::Framework* world) { world->collections(collection); world->create(world_create); diff --git a/tests/memexist.cc b/tests/memexist.cc index a9430a33..e3a57c5c 100644 --- a/tests/memexist.cc +++ b/tests/memexist.cc @@ -151,14 +151,14 @@ static void *world_create(server_startup_st& servers, test_return_t& error) if (server_startup(servers, "memcached", libtest::default_port(), 0, NULL) == false) { - error= TEST_FAILURE; + error= TEST_SKIPPED; } return &servers; } -void get_world(Framework *world) +void get_world(libtest::Framework* world) { world->collections(collection); world->create(world_create); diff --git a/tests/memflush.cc b/tests/memflush.cc index d8e0b5f8..3ba91459 100644 --- a/tests/memflush.cc +++ b/tests/memflush.cc @@ -103,14 +103,14 @@ static void *world_create(server_startup_st& servers, test_return_t& error) if (server_startup(servers, "memcached", libtest::default_port(), 0, NULL) == 0) { - error= TEST_FAILURE; + error= TEST_SKIPPED; } return &servers; } -void get_world(Framework *world) +void get_world(libtest::Framework* world) { executable= "./clients/memflush"; world->collections(collection); diff --git a/tests/memrm.cc b/tests/memrm.cc index 5c3b6d52..58da088c 100644 --- a/tests/memrm.cc +++ b/tests/memrm.cc @@ -161,7 +161,7 @@ static void *world_create(server_startup_st& servers, test_return_t& error) } -void get_world(Framework *world) +void get_world(libtest::Framework* world) { world->collections(collection); world->create(world_create); diff --git a/tests/memslap.cc b/tests/memslap.cc index 57b7c355..c1500829 100644 --- a/tests/memslap.cc +++ b/tests/memslap.cc @@ -183,7 +183,7 @@ static void *world_create(server_startup_st& servers, test_return_t& error) } -void get_world(Framework *world) +void get_world(libtest::Framework* world) { executable= "./clients/memslap"; world->collections(collection); diff --git a/tests/memstat.cc b/tests/memstat.cc index b6053aeb..9b8cb836 100644 --- a/tests/memstat.cc +++ b/tests/memstat.cc @@ -115,14 +115,14 @@ static void *world_create(server_startup_st& servers, test_return_t& error) if (server_startup(servers, "memcached", libtest::default_port(), 0, NULL) == false) { - error= TEST_FAILURE; + error= TEST_SKIPPED; } return &servers; } -void get_world(Framework *world) +void get_world(libtest::Framework* world) { world->collections(collection); world->create(world_create); diff --git a/tests/memtouch.cc b/tests/memtouch.cc index 647485e4..48cadcf2 100644 --- a/tests/memtouch.cc +++ b/tests/memtouch.cc @@ -147,14 +147,14 @@ static void *world_create(server_startup_st& servers, test_return_t& error) if (server_startup(servers, "memcached", libtest::default_port(), 0, NULL) == false) { - error= TEST_FAILURE; + error= TEST_SKIPPED; } return &servers; } -void get_world(Framework *world) +void get_world(libtest::Framework* world) { executable= "./clients/memtouch"; world->collections(collection); diff --git a/tests/parser.cc b/tests/parser.cc index 70783053..220d9ef5 100644 --- a/tests/parser.cc +++ b/tests/parser.cc @@ -124,7 +124,7 @@ collection_st collection[] ={ {0, 0, 0, 0} }; -void get_world(Framework *world) +void get_world(libtest::Framework* world) { world->collections(collection); } -- 2.30.2