Merge

diff --git a/libmemcached/include.am b/libmemcached/include.am
index 448a2e2041973459457999d7e1e992bfda0c792b..99663d309401ff774c724bfc747352c034520c18 100644 (file)
--- a/libmemcached/include.am
+++ b/libmemcached/include.am
@@ -6,48 +6,45 @@ libmemcached_libmemcached_la_SOURCES =
 
 include libmemcached/csl/include.am
 
-EXTRA_DIST+= \
-            libmemcached/libmemcached_probes.d \
-            libmemcached/memcached/README.txt
-
-nobase_include_HEADERS+= libmemcached/result.h
-nobase_include_HEADERS+= \
-                        libmemcached/memcached.h \
-                        libmemcached/memcached.hpp \
-                        libmemcached/util.h
-
-noinst_HEADERS+= \
-                libmemcached/array.h \
-                libmemcached/assert.hpp \
-                libmemcached/backtrace.hpp \
-                libmemcached/byteorder.h \
-                libmemcached/common.h \
-                libmemcached/connect.hpp \
-                libmemcached/continuum.hpp \
-                libmemcached/do.hpp \
-                libmemcached/encoding_key.h \
-                libmemcached/error.hpp \
-                libmemcached/initialize_query.h \
-                libmemcached/internal.h \
-                libmemcached/io.h \
-                libmemcached/io.hpp \
-                libmemcached/is.h \
-                libmemcached/key.hpp \
-                libmemcached/libmemcached_probes.h \
-                libmemcached/memcached/protocol_binary.h \
-                libmemcached/memcached/vbucket.h \
-                libmemcached/memory.h \
-                libmemcached/namespace.h \
-                libmemcached/options.hpp \
-                libmemcached/response.h \
-                libmemcached/sasl.hpp \
-                libmemcached/server.hpp \
-                libmemcached/server_instance.h \
-                libmemcached/socket.hpp \
-                libmemcached/string.hpp \
-                libmemcached/udp.hpp \
-                libmemcached/virtual_bucket.h \
-                libmemcached/watchpoint.h
+EXTRA_DIST+= libmemcached/libmemcached_probes.d
+EXTRA_DIST+= libmemcached/memcached/README.txt
+
+nobase_include_HEADERS+= libmemcached/memcached.h
+nobase_include_HEADERS+= libmemcached/memcached.hpp
+nobase_include_HEADERS+= libmemcached/util.h
+
+noinst_HEADERS+= libmemcached/array.h 
+noinst_HEADERS+= libmemcached/assert.hpp 
+noinst_HEADERS+= libmemcached/backtrace.hpp 
+noinst_HEADERS+= libmemcached/byteorder.h 
+noinst_HEADERS+= libmemcached/common.h 
+noinst_HEADERS+= libmemcached/connect.hpp 
+noinst_HEADERS+= libmemcached/continuum.hpp 
+noinst_HEADERS+= libmemcached/do.hpp 
+noinst_HEADERS+= libmemcached/encoding_key.h 
+noinst_HEADERS+= libmemcached/error.hpp 
+noinst_HEADERS+= libmemcached/initialize_query.h 
+noinst_HEADERS+= libmemcached/internal.h 
+noinst_HEADERS+= libmemcached/io.h 
+noinst_HEADERS+= libmemcached/io.hpp 
+noinst_HEADERS+= libmemcached/is.h 
+noinst_HEADERS+= libmemcached/key.hpp 
+noinst_HEADERS+= libmemcached/libmemcached_probes.h 
+noinst_HEADERS+= libmemcached/memcached/protocol_binary.h 
+noinst_HEADERS+= libmemcached/memcached/vbucket.h 
+noinst_HEADERS+= libmemcached/memory.h 
+noinst_HEADERS+= libmemcached/namespace.h 
+noinst_HEADERS+= libmemcached/options.hpp 
+noinst_HEADERS+= libmemcached/response.h 
+noinst_HEADERS+= libmemcached/result.h
+noinst_HEADERS+= libmemcached/sasl.hpp 
+noinst_HEADERS+= libmemcached/server.hpp 
+noinst_HEADERS+= libmemcached/server_instance.h 
+noinst_HEADERS+= libmemcached/socket.hpp 
+noinst_HEADERS+= libmemcached/string.hpp 
+noinst_HEADERS+= libmemcached/udp.hpp 
+noinst_HEADERS+= libmemcached/virtual_bucket.h 
+noinst_HEADERS+= libmemcached/watchpoint.h
 
 lib_LTLIBRARIES+= libmemcached/libmemcached.la
 libmemcached_libmemcached_la_CFLAGS= -DBUILDING_LIBMEMCACHED

diff --git a/libtest/fatal.cc b/libtest/fatal.cc
index 4cef2047b5f4c06f0de5a61eca718871b903240d..0114635b0de2dee0f18a0a132c9587e2b51b8c95 100644 (file)
--- a/libtest/fatal.cc
+++ b/libtest/fatal.cc
@@ -45,12 +45,12 @@ bool fatal::is_disabled()
   return _disabled;
 }
 
-bool fatal::disable()
+void fatal::disable()
 {
   _disabled= true;
 }
 
-bool fatal::enable()
+void fatal::enable()
 {
   _disabled= false;
 }

diff --git a/libtest/fatal.hpp b/libtest/fatal.hpp
index c1c2b6838fbf929d6d0826e569c857fc8455629b..77050e517b4842a2fe445e129a54a5b6d3463995 100644 (file)
--- a/libtest/fatal.hpp
+++ b/libtest/fatal.hpp
@@ -43,8 +43,8 @@ public:
 
   // The following are just for unittesting the exception class
   static bool is_disabled();
-  static bool disable();
-  static bool enable();
+  static void disable();
+  static void enable();
   static uint32_t disabled_counter();
   static void increment_disabled_counter();
 

diff --git a/libtest/http.cc b/libtest/http.cc
index 920fd021d647f34d1a01d257adcecad100b5b892..8c36371d0827529aab2db90c5155e2908fc8a97c 100644 (file)
--- a/libtest/http.cc
+++ b/libtest/http.cc
@@ -56,7 +56,7 @@ static pthread_once_t start_key_once= PTHREAD_ONCE_INIT;
 void initialize_curl(void)
 {
   int ret;
-  if (pthread_once(&start_key_once, initialize_curl_startup) != 0)
+  if ((ret= pthread_once(&start_key_once, initialize_curl_startup)) != 0)
   {
     fatal_message(strerror(ret));
   }
@@ -70,8 +70,6 @@ namespace http {
 extern "C" size_t
   http_get_result_callback(void *ptr, size_t size, size_t nmemb, void *data)
   {
-    size_t body_size= size * nmemb;
-
     vchar_t *_body= (vchar_t*)data;
 
     _body->resize(size * nmemb);
@@ -102,6 +100,8 @@ HTTP::HTTP(const std::string& url_arg) :
 
 bool GET::execute()
 {
+  (void)init;
+
   if (HAVE_LIBCURL)
   {
 #if defined(HAVE_LIBCURL) && HAVE_LIBCURL

diff --git a/libtest/server.cc b/libtest/server.cc
index 6ff6fc3a3a24a50a3377f8640d9d332783de529c..99a9eeb960eb0614f90838bd90c02084e598a5a0 100644 (file)
--- a/libtest/server.cc
+++ b/libtest/server.cc
@@ -205,17 +205,17 @@ bool Server::start()
         }
 
         char buf[PATH_MAX];
-        getcwd(buf, sizeof(buf));
+        char *getcwd_buf= getcwd(buf, sizeof(buf));
         throw libtest::fatal(LIBYATL_DEFAULT_PARAM,
                              "Unable to open pidfile in %s for: %s stderr:%s",
-                             buf,
+                             getcwd_buf ? getcwd_buf : "",
                              _running.c_str(),
                              _app.stderr_c_str());
       }
     }
   }
 
-  uint32_t this_wait;
+  uint32_t this_wait= 0;
   bool pinged= false;
   {
     uint32_t timeout= 20; // This number should be high enough for valgrind startup (which is slow)
@@ -247,7 +247,8 @@ bool Server::start()
       if (kill_file(pid_file()) == false)
       {
         throw libtest::fatal(LIBYATL_DEFAULT_PARAM,
-                             "Failed to kill off server after startup occurred, when pinging failed: %s stderr:%s",
+                             "Failed to kill off server, waited: %u after startup occurred, when pinging failed: %s stderr:%s",
+                             this_wait,
                              pid_file().c_str(),
                              _app.stderr_c_str());
       }
@@ -260,7 +261,8 @@ bool Server::start()
     else
     {
       throw libtest::fatal(LIBYATL_DEFAULT_PARAM,
-                           "Failed to ping() server started. exec: %s stderr:%s",
+                           "Failed to ping(), waited: %u server started. exec: %s stderr:%s",
+                           this_wait,
                            _running.c_str(),
                            _app.stderr_c_str());
     }

diff --git a/support/libmemcached.spec.in b/support/libmemcached.spec.in
index afca3049088c55d62beb006ec7703114108bc66b..f1a108b643a078cb39e8d092c400319a8a99bc18 100644 (file)
--- a/support/libmemcached.spec.in
+++ b/support/libmemcached.spec.in
@@ -88,12 +88,12 @@ you will need to install %{name}-devel.
 %exclude %{_libdir}/libhashkit.a
 %exclude %{_libdir}/libmemcachedutil.a
 %exclude %{_libdir}/libmemcachedprotocol.a
-%{_libdir}/libhashkit.so.1.0.0
-%{_libdir}/libmemcached.so.9.0.0
+%{_libdir}/libhashkit.so.2.0.0
+%{_libdir}/libmemcached.so.10.0.0
 %{_libdir}/libmemcachedutil.so.2.0.0
 %{_libdir}/libmemcachedprotocol.so.0.0.0
-%{_libdir}/libhashkit.so.1
-%{_libdir}/libmemcached.so.9
+%{_libdir}/libhashkit.so.2
+%{_libdir}/libmemcached.so.10
 %{_libdir}/libmemcachedprotocol.so.0
 %{_libdir}/libmemcachedutil.so.2
 %{_mandir}/man1/memcapable.1.gz
@@ -199,6 +199,8 @@ you will need to install %{name}-devel.
 %{_includedir}/libmemcached-1.0/verbosity.h
 %{_includedir}/libmemcached-1.0/version.h
 %{_includedir}/libmemcached-1.0/visibility.h
+%{_includedir}/libhashkit-1.0/string.h
+%{_includedir}/libmemcached-1.0/encoding_key.h
 
 %{_libdir}/libhashkit.so
 %{_libdir}/libmemcached.so