From: Brian Aker <brian@tangent.org>
Date: Fri, 2 Mar 2012 07:16:22 +0000 (-0800)
Subject: Merge in Ubuntu fixes.
X-Git-Tag: 1.0.5~17
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=51b26f0157fe827183eeb73bf27b67f6211f627e;p=m6w6%2Flibmemcached

Merge in Ubuntu fixes.
---

diff --git a/example/memcached_light.cc b/example/memcached_light.cc
index 4bf82825..61c5314d 100644
--- a/example/memcached_light.cc
+++ b/example/memcached_light.cc
@@ -624,7 +624,7 @@ int main(int argc, char **argv)
 
 
   /* Serve all of the clients */
-  switch (event_base_loop(event_base, 0) == -1)
+  switch (event_base_loop(event_base, 0))
   {
   case -1:
     log_file.write(util::VERBOSE_ERROR, "event_base_loop() failed");
diff --git a/util/log.hpp b/util/log.hpp
index b7f257d7..3c940758 100644
--- a/util/log.hpp
+++ b/util/log.hpp
@@ -96,7 +96,7 @@ struct log_info_st
           if (opt_syslog)
           {
             char buffer[1024];
-            getcwd(buffer, sizeof(buffer));
+            (void)getcwd(buffer, sizeof(buffer));
             syslog(LOG_ERR, "Could not open log file \"%.*s\", from \"%s\", open failed with (%s)", 
                    int(filename.size()), filename.c_str(), 
                    buffer,