From 8567f3cfbf415397ab159060d7717f684ec26532 Mon Sep 17 00:00:00 2001
From: Davin McCall <davmac@davmac.org>
Date: Fri, 16 Jun 2017 09:57:27 +0100
Subject: [PATCH] Rename ServiceIoWatcher to exec_status_pipe_watcher.

---
 src/service.cc | 2 +-
 src/service.h  | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/service.cc b/src/service.cc
index 3c802e8..bd5a388 100644
--- a/src/service.cc
+++ b/src/service.cc
@@ -330,7 +330,7 @@ void scripted_service::handle_exit_status(int exit_status) noexcept
     }
 }
 
-rearm ServiceIoWatcher::fd_event(eventloop_t &loop, int fd, int flags) noexcept
+rearm exec_status_pipe_watcher::fd_event(eventloop_t &loop, int fd, int flags) noexcept
 {
     base_process_service *sr = service;
     sr->waiting_for_execstat = false;
diff --git a/src/service.h b/src/service.h
index 1eb47c3..19d4068 100644
--- a/src/service.h
+++ b/src/service.h
@@ -221,13 +221,14 @@ class service_child_watcher : public eventloop_t::child_proc_watcher_impl<servic
     service_child_watcher(base_process_service * sr) noexcept : service(sr) { }
 };
 
-class ServiceIoWatcher : public eventloop_t::fd_watcher_impl<ServiceIoWatcher>
+// Watcher for the pipe used to receive exec() failure status errno
+class exec_status_pipe_watcher : public eventloop_t::fd_watcher_impl<exec_status_pipe_watcher>
 {
     public:
     base_process_service * service;
     rearm fd_event(eventloop_t &eloop, int fd, int flags) noexcept;
     
-    ServiceIoWatcher(base_process_service * sr) noexcept : service(sr) { }
+    exec_status_pipe_watcher(base_process_service * sr) noexcept : service(sr) { }
 };
 
 class service_record
@@ -594,7 +595,7 @@ class process_restart_timer : public eventloop_t::timer_impl<process_restart_tim
 class base_process_service : public service_record
 {
     friend class service_child_watcher;
-    friend class ServiceIoWatcher;
+    friend class exec_status_pipe_watcher;
     friend class process_restart_timer;
 
     private:
@@ -603,7 +604,7 @@ class base_process_service : public service_record
 
     protected:
     service_child_watcher child_listener;
-    ServiceIoWatcher child_status_listener;
+    exec_status_pipe_watcher child_status_listener;
     process_restart_timer restart_timer;
     timespec last_start_time;
 
-- 
2.25.1