From a0e92588055b1d7b070c999ec56de049c24708c6 Mon Sep 17 00:00:00 2001
From: Mauro Passerino <mpasserino@irobot.com>
Date: Thu, 21 Jan 2021 17:30:36 -0300
Subject: [PATCH] Reorder APIs arguments

---
 rmw/include/rmw/rmw.h | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/rmw/include/rmw/rmw.h b/rmw/include/rmw/rmw.h
index a58c08c5..fe197b68 100644
--- a/rmw/include/rmw/rmw.h
+++ b/rmw/include/rmw/rmw.h
@@ -2804,10 +2804,10 @@ RMW_PUBLIC
 RMW_WARN_UNUSED
 rmw_ret_t
 rmw_subscription_set_listener_callback(
-  const void * user_data,
+  rmw_subscription_t * rmw_subscription,
   rmw_listener_cb_t listener_callback,
-  const void * subscription_handle,
-  rmw_subscription_t * rmw_subscription);
+  const void * user_data,
+  const void * subscription_handle);
 
 /// Set callback function of the rmw service listener.
 /**
@@ -2825,10 +2825,10 @@ RMW_PUBLIC
 RMW_WARN_UNUSED
 rmw_ret_t
 rmw_service_set_listener_callback(
-  const void * user_data,
+  rmw_service_t * rmw_service,
   rmw_listener_cb_t listener_callback,
-  const void * service_handle,
-  rmw_service_t * rmw_service);
+  const void * user_data,
+  const void * service_handle);
 
 /// Set callback function of the rmw client listener.
 /**
@@ -2846,10 +2846,10 @@ RMW_PUBLIC
 RMW_WARN_UNUSED
 rmw_ret_t
 rmw_client_set_listener_callback(
-  const void * user_data,
+  rmw_client_t * rmw_client,
   rmw_listener_cb_t listener_callback,
-  const void * client_handle,
-  rmw_client_t * rmw_client);
+  const void * user_data,
+  const void * client_handle);
 
 /// Set callback function of the rmw guard condition listener.
 /**
@@ -2869,10 +2869,10 @@ RMW_PUBLIC
 RMW_WARN_UNUSED
 rmw_ret_t
 rmw_guard_condition_set_listener_callback(
-  const void * user_data,
+  rmw_guard_condition_t * rmw_guard_condition,
   rmw_listener_cb_t listener_callback,
+  const void * user_data,
   const void * guard_condition_handle,
-  rmw_guard_condition_t * rmw_guard_condition,
   bool use_previous_events);
 
 /// Set callback function of the rmw event listener.
@@ -2893,10 +2893,10 @@ RMW_PUBLIC
 RMW_WARN_UNUSED
 rmw_ret_t
 rmw_event_set_listener_callback(
-  const void * user_data,
+  rmw_event_t * rmw_event,
   rmw_listener_cb_t listener_callback,
+  const void * user_data,
   const void * event_handle,
-  rmw_event_t * rmw_event,
   bool use_previous_events);
 
 #ifdef __cplusplus