From dec22a296f7972edeabb610c663c196cd0050f60 Mon Sep 17 00:00:00 2001
From: William Woodall <william@osrfoundation.org>
Date: Fri, 12 Apr 2024 07:50:22 -0700
Subject: [PATCH] fixup var names to snake case (#2501)

Signed-off-by: William Woodall <william@osrfoundation.org>
---
 rclcpp/include/rclcpp/executor.hpp | 2 +-
 rclcpp/include/rclcpp/timer.hpp    | 6 +++---
 rclcpp/src/rclcpp/executor.cpp     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/rclcpp/include/rclcpp/executor.hpp b/rclcpp/include/rclcpp/executor.hpp
index 132b8150fe..d6b78fd133 100644
--- a/rclcpp/include/rclcpp/executor.hpp
+++ b/rclcpp/include/rclcpp/executor.hpp
@@ -487,7 +487,7 @@ class Executor
    */
   RCLCPP_PUBLIC
   static void
-  execute_timer(rclcpp::TimerBase::SharedPtr timer, const std::shared_ptr<void> & dataPtr);
+  execute_timer(rclcpp::TimerBase::SharedPtr timer, const std::shared_ptr<void> & data_ptr);
 
   /// Run service server executable.
   /**
diff --git a/rclcpp/include/rclcpp/timer.hpp b/rclcpp/include/rclcpp/timer.hpp
index ad9e96ea40..0ed62007d4 100644
--- a/rclcpp/include/rclcpp/timer.hpp
+++ b/rclcpp/include/rclcpp/timer.hpp
@@ -326,10 +326,10 @@ class GenericTimer : public TimerBase
     >::type * = nullptr
   >
   void
-  execute_callback_delegate(const rcl_timer_call_info_t & timer_call_info_)
+  execute_callback_delegate(const rcl_timer_call_info_t & timer_call_info)
   {
-    const TimerInfo info{Time{timer_call_info_.expected_call_time, clock_->get_clock_type()},
-      Time{timer_call_info_.actual_call_time, clock_->get_clock_type()}};
+    const TimerInfo info{Time{timer_call_info.expected_call_time, clock_->get_clock_type()},
+      Time{timer_call_info.actual_call_time, clock_->get_clock_type()}};
     callback_(info);
   }
 
diff --git a/rclcpp/src/rclcpp/executor.cpp b/rclcpp/src/rclcpp/executor.cpp
index 0b78e12912..537a88a2f3 100644
--- a/rclcpp/src/rclcpp/executor.cpp
+++ b/rclcpp/src/rclcpp/executor.cpp
@@ -547,9 +547,9 @@ Executor::execute_subscription(rclcpp::SubscriptionBase::SharedPtr subscription)
 }
 
 void
-Executor::execute_timer(rclcpp::TimerBase::SharedPtr timer, const std::shared_ptr<void> & dataPtr)
+Executor::execute_timer(rclcpp::TimerBase::SharedPtr timer, const std::shared_ptr<void> & data_ptr)
 {
-  timer->execute_callback(dataPtr);
+  timer->execute_callback(data_ptr);
 }
 
 void