From bc253ff1c35b279eb008b3710be9977a333da618 Mon Sep 17 00:00:00 2001
From: Brian Aker <brian@tangent.org>
Date: Mon, 9 Apr 2012 03:23:18 -0700
Subject: [PATCH] Update from libtest

---
 libtest/fatal.cc  |  4 ++--
 libtest/fatal.hpp |  4 ++--
 libtest/http.cc   |  6 +++---
 libtest/server.cc | 12 +++++++-----
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/libtest/fatal.cc b/libtest/fatal.cc
index 4cef2047..0114635b 100644
--- 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 c1c2b683..77050e51 100644
--- 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 920fd021..8c36371d 100644
--- 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 6ff6fc3a..99a9eeb9 100644
--- 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());
     }
-- 
2.30.2