Reorder APIs arguments

Author: Mauro Passerino

rclcpp/include/rclcpp/executors/events_executor_notify_waitable.hpp

@@ -66,10 +66,10 @@ class EventsExecutorNotifyWaitable final : public EventWaitable
   {
     for (auto gc : notify_guard_conditions_) {
       rcl_ret_t ret = rcl_guard_condition_set_listener_callback(
-        executor,
+        gc,
         executor_callback,
+        executor,
         this,
-        gc,
         false);
 
       if (RCL_RET_OK != ret) {

rclcpp/src/rclcpp/client.cpp

@@ -205,10 +205,10 @@ ClientBase::set_events_executor_callback(
   rmw_listener_cb_t executor_callback) const
 {
   rcl_ret_t ret = rcl_client_set_listener_callback(
-    executor,
+    client_handle_.get(),
     executor_callback,
-    this,
-    client_handle_.get());
+    executor,
+    this);
 
   if (RCL_RET_OK != ret) {
     throw std::runtime_error("Couldn't set the EventsExecutor's callback to client");

rclcpp/src/rclcpp/executors/events_executor_entities_collector.cpp

@@ -478,10 +478,10 @@ EventsExecutorEntitiesCollector::set_guard_condition_callback(
   const rcl_guard_condition_t * guard_condition)
 {
   rcl_ret_t ret = rcl_guard_condition_set_listener_callback(
-    associated_executor_,
+    guard_condition,
     &EventsExecutor::push_event,
+    associated_executor_,
     this,
-    guard_condition,
     false /* Discard previous events */);
 
   if (ret != RCL_RET_OK) {
@@ -494,10 +494,10 @@ EventsExecutorEntitiesCollector::unset_guard_condition_callback(
   const rcl_guard_condition_t * guard_condition)
 {
   rcl_ret_t ret = rcl_guard_condition_set_listener_callback(
+    guard_condition,
     nullptr,
     nullptr,
     nullptr,
-    guard_condition,
     false /* Discard previous events */);
 
   if (ret != RCL_RET_OK) {

rclcpp/src/rclcpp/qos_event.cpp

@@ -74,10 +74,10 @@ QOSEventHandlerBase::set_events_executor_callback(
   rmw_listener_cb_t executor_callback) const
 {
   rcl_ret_t ret = rcl_event_set_listener_callback(
-    executor,
+    &event_handle_,
     executor_callback,
+    executor,
     this,
-    &event_handle_,
     false /* Discard previous events */);
 
   if (RCL_RET_OK != ret) {

rclcpp/src/rclcpp/service.cpp

@@ -91,10 +91,10 @@ ServiceBase::set_events_executor_callback(
   rmw_listener_cb_t executor_callback) const
 {
   rcl_ret_t ret = rcl_service_set_listener_callback(
-    executor,
+    service_handle_.get(),
     executor_callback,
-    this,
-    service_handle_.get());
+    executor,
+    this);
 
   if (RCL_RET_OK != ret) {
     throw std::runtime_error("Couldn't set the EventsExecutor's callback to service");

rclcpp/src/rclcpp/subscription_base.cpp

@@ -295,10 +295,10 @@ SubscriptionBase::set_events_executor_callback(
   rmw_listener_cb_t executor_callback) const
 {
   rcl_ret_t ret = rcl_subscription_set_listener_callback(
-    executor,
+    subscription_handle_.get(),
     executor_callback,
-    this,
-    subscription_handle_.get());
+    executor,
+    this);
 
   if (RCL_RET_OK != ret) {
     throw std::runtime_error("Couldn't set the EventsExecutor's callback to subscription");

rclcpp/src/rclcpp/subscription_intra_process_base.cpp

@@ -43,10 +43,10 @@ SubscriptionIntraProcessBase::set_events_executor_callback(
   rmw_listener_cb_t executor_callback) const
 {
   rcl_ret_t ret = rcl_guard_condition_set_listener_callback(
-    executor,
+    &gc_,
     executor_callback,
+    executor,
     this,
-    &gc_,
     true /*Use previous events*/);
 
   if (RCL_RET_OK != ret) {

rclcpp/test/rclcpp/executors/test_executors.cpp

@@ -473,10 +473,10 @@ class TestWaitable : public rclcpp::Waitable
     rmw_listener_cb_t executor_callback) const override
   {
     rcl_ret_t ret = rcl_guard_condition_set_listener_callback(
-      executor,
+      &gc_,
       executor_callback,
+      executor,
       this,
-      &gc_,
       true /*Use previous events*/);
 
     if (RCL_RET_OK != ret) {