Renaming of some snake-case functions missed in prior rename batches.

diff --git a/src/control.cc b/src/control.cc
index 395ae49fc7e9f9f20c3eb2375323c813065afb7f..85a70ec25520ee0c1d3dbd0fa1bb17bac44b3f17 100644 (file)
--- a/src/control.cc
+++ b/src/control.cc
@@ -308,7 +308,7 @@ control_conn_t::handle_t control_conn_t::allocate_service_handle(service_record
     serviceKeyMap.insert(std::make_pair(record, candidate));
     
     if (is_unique) {
-        record->addListener(this);
+        record->add_listener(this);
     }
     
     return candidate;
@@ -523,7 +523,7 @@ control_conn_t::~control_conn_t() noexcept
     
     // Clear service listeners
     for (auto p : serviceKeyMap) {
-        p.first->removeListener(this);
+        p.first->remove_listener(this);
     }
     
     active_control_conns--;

diff --git a/src/includes/service.h b/src/includes/service.h
index 47aae1ba9c73a376b784e7f4f4e2fb11a1491317..b0cf50a0406b17d5ee5ba7583f723b11aa8f3ef6 100644 (file)
--- a/src/includes/service.h
+++ b/src/includes/service.h
@@ -562,19 +562,19 @@ class service_record
     // commence starting/stopping.
     void unpin() noexcept;
     
-    bool isDummy() noexcept
+    bool is_dummy() noexcept
     {
         return record_type == service_type_t::DUMMY;
     }
     
     // Add a listener. A listener must only be added once. May throw std::bad_alloc.
-    void addListener(service_listener * listener)
+    void add_listener(service_listener * listener)
     {
         listeners.insert(listener);
     }
     
     // Remove a listener.    
-    void removeListener(service_listener * listener) noexcept
+    void remove_listener(service_listener * listener) noexcept
     {
         listeners.erase(listener);
     }

diff --git a/src/load_service.cc b/src/load_service.cc
index 21bff4d8c16385ef2e5f598b67990f6cc8afe572..7944cb3d07e20fa98591da9185bad80557bc3c86 100644 (file)
--- a/src/load_service.cc
+++ b/src/load_service.cc
@@ -371,7 +371,7 @@ service_record * dirload_service_set::load_service(const char * name)
     // First try and find an existing record...
     service_record * rval = find_service(string(name));
     if (rval != 0) {
-        if (rval->isDummy()) {
+        if (rval->is_dummy()) {
             throw service_cyclic_dependency(name);
         }
         return rval;