From 51b26f0157fe827183eeb73bf27b67f6211f627e Mon Sep 17 00:00:00 2001 From: Brian Aker Date: Thu, 1 Mar 2012 23:16:22 -0800 Subject: [PATCH] Merge in Ubuntu fixes. --- example/memcached_light.cc | 2 +- util/log.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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, -- 2.30.2