From da85617428af0c35e9c5e7db21ec8a613ddd8b7c Mon Sep 17 00:00:00 2001
From: Florent Le Coz <louiz@louiz.org>
Date: Sat, 8 Feb 2014 07:59:02 +0100
Subject: Use strerror and log_error instead of perrror

---
 src/network/poller.cpp         | 14 +++++++-------
 src/network/socket_handler.cpp |  5 ++---
 2 files changed, 9 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/network/poller.cpp b/src/network/poller.cpp
index 66b73f8..a157da9 100644
--- a/src/network/poller.cpp
+++ b/src/network/poller.cpp
@@ -16,7 +16,7 @@ Poller::Poller()
   this->epfd = ::epoll_create1(0);
   if (this->epfd == -1)
     {
-      perror("epoll");
+      log_error("epoll failed: " << strerror(errno));
       throw std::runtime_error("Could not create epoll instance");
     }
 #endif
@@ -47,7 +47,7 @@ void Poller::add_socket_handler(std::shared_ptr<SocketHandler> socket_handler)
   const int res = ::epoll_ctl(this->epfd, EPOLL_CTL_ADD, socket_handler->get_socket(), &event);
   if (res == -1)
     {
-      perror("epoll_ctl");
+      log_error("epoll_ctl failed: " << strerror(errno));
       throw std::runtime_error("Could not add socket to epoll");
     }
 #endif
@@ -79,7 +79,7 @@ void Poller::remove_socket_handler(const socket_t socket)
   const int res = ::epoll_ctl(this->epfd, EPOLL_CTL_DEL, socket, nullptr);
   if (res == -1)
     {
-      perror("epoll_ctl");
+      log_error("epoll_ctl failed: " << strerror(errno));
       throw std::runtime_error("Could not remove socket from epoll");
     }
 #endif
@@ -102,7 +102,7 @@ void Poller::watch_send_events(SocketHandler* socket_handler)
   const int res = ::epoll_ctl(this->epfd, EPOLL_CTL_MOD, socket_handler->get_socket(), &event);
   if (res == -1)
     {
-      perror("epoll_ctl");
+      log_error("epoll_ctl failed: " << strerror(errno));
       throw std::runtime_error("Could not modify socket flags in epoll");
     }
 #endif
@@ -125,7 +125,7 @@ void Poller::stop_watching_send_events(SocketHandler* socket_handler)
   const int res = ::epoll_ctl(this->epfd, EPOLL_CTL_MOD, socket_handler->get_socket(), &event);
   if (res == -1)
     {
-      perror("epoll_ctl");
+      log_error("epoll_ctl failed: " << strerror(errno));
       throw std::runtime_error("Could not modify socket flags in epoll");
     }
 #endif
@@ -141,7 +141,7 @@ int Poller::poll(const std::chrono::milliseconds& timeout)
     {
       if (errno == EINTR)
         return true;
-      perror("poll");
+      log_error("poll failed: " << strerror(errno));
       throw std::runtime_error("Poll failed");
     }
   // We cannot possibly have more ready events than the number of fds we are
@@ -173,7 +173,7 @@ int Poller::poll(const std::chrono::milliseconds& timeout)
     {
       if (errno == EINTR)
         return 0;
-      perror("epoll_wait");
+      log_error("epoll wait: " << strerror(errno));
       throw std::runtime_error("Epoll_wait failed");
     }
   for (int i = 0; i < nb_events; ++i)
diff --git a/src/network/socket_handler.cpp b/src/network/socket_handler.cpp
index ea674d1..3fe423e 100644
--- a/src/network/socket_handler.cpp
+++ b/src/network/socket_handler.cpp
@@ -56,8 +56,7 @@ std::pair<bool, std::string> SocketHandler::connect(const std::string& address,
           this->on_connected();
           return std::make_pair(true, "");
         }
-      log_info("Connection failed:");
-      perror("connect");
+      log_info("Connection failed:" << strerror(errno));
     }
   log_error("All connection attempts failed.");
   this->close();
@@ -97,7 +96,7 @@ void SocketHandler::on_send()
   const ssize_t res = ::send(this->socket, this->out_buf.data(), this->out_buf.size(), 0);
   if (res == -1)
     {
-      perror("send");
+      log_error("send failed: " << strerror(errno));
       this->close();
     }
   else
-- 
cgit v1.2.3