Merge in Ubuntu fixes.

diff --git a/example/memcached_light.cc b/example/memcached_light.cc
index 4bf828250e27787b8a6b3e105da0ea7d46260a63..61c5314da950ce4d5fe42882355bede0185fd0ae 100644 (file)
--- 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 b7f257d757536c4985bc1f8e899bfc252fb2d01e..3c940758dc2b4bf3d28c0e155932ff78c810d9b7 100644 (file)
--- 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,