Renaming: camelCase to snake_case.

diff --git a/src/control.cc b/src/control.cc
index e285e2b7328f97cea2a2af70eaec149be2062423..a804b51e89a67cdd2048e82a71a7f610b5bf8a7b 100644 (file)
--- a/src/control.cc
+++ b/src/control.cc
@@ -295,12 +295,12 @@ control_conn_t::handle_t control_conn_t::allocate_service_handle(service_record
     // Try to find a unique handle (integer) in a single pass. Since the map is ordered, we can search until
     // we find a gap in the handle values.
     handle_t candidate = 0;
-    for (auto p : keyServiceMap) {
+    for (auto p : key_service_map) {
         if (p.first == candidate) candidate++;
         else break;
     }
 
-    bool is_unique = (serviceKeyMap.find(record) == serviceKeyMap.end());
+    bool is_unique = (service_key_map.find(record) == service_key_map.end());
 
     // The following operations perform allocation (can throw std::bad_alloc). If an exception occurs we
     // must undo any previous actions:
@@ -309,15 +309,15 @@ control_conn_t::handle_t control_conn_t::allocate_service_handle(service_record
     }
     
     try {
-        keyServiceMap[candidate] = record;
-        serviceKeyMap.insert(std::make_pair(record, candidate));
+        key_service_map[candidate] = record;
+        service_key_map.insert(std::make_pair(record, candidate));
     }
     catch (...) {
         if (is_unique) {
             record->remove_listener(this);
         }
 
-        keyServiceMap.erase(candidate);
+        key_service_map.erase(candidate);
     }
     
     return candidate;
@@ -531,7 +531,7 @@ control_conn_t::~control_conn_t() noexcept
     iob.deregister(loop);
     
     // Clear service listeners
-    for (auto p : serviceKeyMap) {
+    for (auto p : service_key_map) {
         p.first->remove_listener(this);
     }
     

diff --git a/src/includes/control.h b/src/includes/control.h
index e2aa1df08c71f01df9ed868d7d99c398293cf4ad..bbbda5204edb659ad297d79272449966cc5c471f 100644 (file)
--- a/src/includes/control.h
+++ b/src/includes/control.h
@@ -104,8 +104,8 @@ class control_conn_t : private service_listener
     // A mapping between service records and their associated numerical identifier used
     // in communction
     using handle_t = uint32_t;
-    std::unordered_multimap<service_record *, handle_t> serviceKeyMap;
-    std::map<handle_t, service_record *> keyServiceMap;
+    std::unordered_multimap<service_record *, handle_t> service_key_map;
+    std::map<handle_t, service_record *> key_service_map;
     
     // Buffer for outgoing packets. Each outgoing back is represented as a vector<char>.
     list<vector<char>> outbuf;
@@ -155,7 +155,7 @@ class control_conn_t : private service_listener
     service_record *find_service_for_key(uint32_t key)
     {
         try {
-            return keyServiceMap.at(key);
+            return key_service_map.at(key);
         }
         catch (std::out_of_range &exc) {
             return nullptr;
@@ -176,7 +176,7 @@ class control_conn_t : private service_listener
     void service_event(service_record * service, service_event_t event) noexcept final override
     {
         // For each service handle corresponding to the event, send an information packet.
-        auto range = serviceKeyMap.equal_range(service);
+        auto range = service_key_map.equal_range(service);
         auto & i = range.first;
         auto & end = range.second;
         try {