(fix) uncrustify

Author: Karsten1987

rclcpp_lifecycle/CMakeLists.txt

@@ -65,4 +65,9 @@ endmacro()
 
 call_for_each_rmw_implementation(targets GENERATE_DEFAULT)
 
+if(BUILD_TESTING)
+  find_package(ament_lint_auto REQUIRED)
+  ament_lint_auto_find_test_dependencies()
+endif()
+
 ament_package()

rclcpp_lifecycle/include/rcl_lifecycle/default_state_machine.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef RCL__DEFAULT_STATE_MACHINE_H_
-#define RCL__DEFAULT_STATE_MACHINE_H_
+#ifndef RCL_LIFECYCLE__DEFAULT_STATE_MACHINE_H_
+#define RCL_LIFECYCLE__DEFAULT_STATE_MACHINE_H_
 
 #include <rcl_lifecycle/visibility_control.h>
 
@@ -39,4 +39,4 @@ const rcl_state_t LIFECYCLE_EXPORT rcl_state_errorprocessing = {"errorprocessing
 }
 #endif  // extern "C"
 
-#endif  // RCL__DEFAULT_STATE_MACHINE_H_
+#endif  // RCL_LIFECYCLE__DEFAULT_STATE_MACHINE_H_

rclcpp_lifecycle/include/rcl_lifecycle/lifecycle_state.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef RCL__LIFECYCLE_STATE_H_
-#define RCL__LIFECYCLE_STATE_H_
+#ifndef RCL_LIFECYCLE__LIFECYCLE_STATE_H_
+#define RCL_LIFECYCLE__LIFECYCLE_STATE_H_
 
 #if __cplusplus
 extern "C"
@@ -36,7 +36,7 @@ typedef int bool;
  */
 typedef struct LIFECYCLE_EXPORT _rcl_state_t
 {
-  const char* label;
+  const char * label;
   unsigned int index;
 } rcl_state_t;
 
@@ -50,9 +50,9 @@ typedef struct LIFECYCLE_EXPORT _rcl_state_t
 typedef struct LIFECYCLE_EXPORT _rcl_state_transition_t
 {
   rcl_state_t transition_state;
-  void* callback;
-  rcl_state_t* start;
-  rcl_state_t* goal;
+  void * callback;
+  rcl_state_t * start;
+  rcl_state_t * goal;
 } rcl_state_transition_t;
 
 /**
@@ -65,7 +65,7 @@ typedef struct LIFECYCLE_EXPORT _rcl_state_transition_t
  */
 typedef struct LIFECYCLE_EXPORT _rcl_state_machine_t
 {
-  const rcl_state_t* current_state;
+  const rcl_state_t * current_state;
   rcl_transition_map_t transition_map;
 } rcl_state_machine_t;
 
@@ -79,22 +79,26 @@ typedef struct LIFECYCLE_EXPORT _rcl_state_machine_t
  * NULL if not available
  */
 LIFECYCLE_EXPORT
-const rcl_state_transition_t*
-rcl_is_valid_transition_by_index(rcl_state_machine_t* state_machine, unsigned int transition_index);
+const rcl_state_transition_t *
+rcl_is_valid_transition_by_index(rcl_state_machine_t * state_machine,
+  unsigned int transition_index);
 LIFECYCLE_EXPORT
-const rcl_state_transition_t*
-rcl_is_valid_transition_by_label(rcl_state_machine_t* state_machine, const char* transition_label);
+const rcl_state_transition_t *
+rcl_is_valid_transition_by_label(rcl_state_machine_t * state_machine,
+  const char * transition_label);
 
 LIFECYCLE_EXPORT
-const rcl_state_transition_t*
-rcl_get_registered_transition_by_index(rcl_state_machine_t* state_machine, unsigned int transition_state_index);
+const rcl_state_transition_t *
+rcl_get_registered_transition_by_index(rcl_state_machine_t * state_machine,
+  unsigned int transition_state_index);
 LIFECYCLE_EXPORT
-const rcl_state_transition_t*
-rcl_get_registered_transition_by_label(rcl_state_machine_t* state_machine, const char* transition_state_label);
+const rcl_state_transition_t *
+rcl_get_registered_transition_by_label(rcl_state_machine_t * state_machine,
+  const char * transition_state_label);
 
 LIFECYCLE_EXPORT
 rcl_state_t
-rcl_create_state(unsigned int state, char* label);
+rcl_create_state(unsigned int state, char * label);
 
 LIFECYCLE_EXPORT
 rcl_state_transition_t
@@ -106,14 +110,16 @@ rcl_get_default_state_machine();
 
 LIFECYCLE_EXPORT
 void
-rcl_register_callback(rcl_state_machine_t* state_machine, unsigned int state_index, unsigned int transition_index, bool(*fcn)(void));
+rcl_register_callback(rcl_state_machine_t * state_machine,
+  unsigned int state_index, unsigned int transition_index, bool (* fcn)(void));
 
 LIFECYCLE_EXPORT
 bool
-rcl_invoke_transition(rcl_state_machine_t* state_machine, rcl_state_t transition_index);
+rcl_invoke_transition(rcl_state_machine_t * state_machine,
+  rcl_state_t transition_index);
 
 #if __cplusplus
 }
 #endif  // extern "C"
 
-#endif  // RCL__LIFECYCLE_STATE_H
+#endif  // RCL_LIFECYCLE__LIFECYCLE_STATE_H_

rclcpp_lifecycle/include/rcl_lifecycle/transition_map.h

@@ -13,8 +13,8 @@
 // limitations under the License.
 
 
-#ifndef RCL__TRANSITION_MAP_H_
-#define RCL__TRANSITION_MAP_H_
+#ifndef RCL_LIFECYCLE__TRANSITION_MAP_H_
+#define RCL_LIFECYCLE__TRANSITION_MAP_H_
 
 #if __cplusplus
 extern "C"
@@ -32,7 +32,7 @@ typedef struct _rcl_state_transition_t rcl_state_transition_t;
  */
 typedef struct LIFECYCLE_EXPORT _transition_array
 {
-  rcl_state_transition_t* transitions;
+  rcl_state_transition_t * transitions;
   unsigned int size;
 } rcl_transition_array_t;
 
@@ -42,17 +42,18 @@ typedef struct LIFECYCLE_EXPORT _transition_array
  */
 typedef struct LIFECYCLE_EXPORT _map
 {
-  //rcl_state_t* state_index;
-  // associative array between primary state and their respective transitions
+  // associative array between primary state
+  // and their respective transitions
   // 1 ps -> 1 transition_array
-  rcl_state_t* primary_states;
-  rcl_transition_array_t* transition_arrays;
+  rcl_state_t * primary_states;
+  rcl_transition_array_t * transition_arrays;
   unsigned int size;
 } rcl_transition_map_t;
 
 LIFECYCLE_EXPORT
 void
-rcl_register_primary_state(rcl_transition_map_t* m, rcl_state_t primary_state);
+rcl_register_primary_state(rcl_transition_map_t * m,
+  rcl_state_t primary_state);
 
 /**
  * @brief appends a transition in a map
@@ -61,7 +62,8 @@ rcl_register_primary_state(rcl_transition_map_t* m, rcl_state_t primary_state);
  */
 LIFECYCLE_EXPORT
 void
-rcl_register_transition_by_state(rcl_transition_map_t* m, rcl_state_t start, rcl_state_t goal, rcl_state_transition_t transition);
+rcl_register_transition_by_state(rcl_transition_map_t * m,
+  rcl_state_t start, rcl_state_t goal, rcl_state_transition_t transition);
 
 /**
  * @brief appends a transition in a map
@@ -70,7 +72,8 @@ rcl_register_transition_by_state(rcl_transition_map_t* m, rcl_state_t start, rcl
  */
 LIFECYCLE_EXPORT
 void
-rcl_register_transition_by_label(rcl_transition_map_t* m, const char* start_label, const char* goal_label, rcl_state_transition_t transition);
+rcl_register_transition_by_label(rcl_transition_map_t * m,
+  const char * start_label, const char * goal_label, rcl_state_transition_t transition);
 
 /**
  * @brief appends a transition in a map
@@ -79,50 +82,55 @@ rcl_register_transition_by_label(rcl_transition_map_t* m, const char* start_labe
  */
 LIFECYCLE_EXPORT
 void
-rcl_register_transition_by_index(rcl_transition_map_t* m, unsigned int start_index, unsigned int goal_index, rcl_state_transition_t transition);
+rcl_register_transition_by_index(rcl_transition_map_t * m,
+  unsigned int start_index, unsigned int goal_index, rcl_state_transition_t transition);
 
 /**
  * @brief gets the registered primary state based on a label
  * @return primary state pointer, NULL if not found
  */
 LIFECYCLE_EXPORT
-rcl_state_t*
-rcl_get_primary_state_by_label(rcl_transition_map_t* m, const char* label);
+rcl_state_t *
+rcl_get_primary_state_by_label(rcl_transition_map_t * m,
+  const char * label);
 /**
  * @brief gets the registered primary state based on a index
  * @return primary state pointer, NULL if not found
  */
 LIFECYCLE_EXPORT
-rcl_state_t*
-rcl_get_primary_state_by_index(rcl_transition_map_t* m, unsigned int index);
+rcl_state_t *
+rcl_get_primary_state_by_index(rcl_transition_map_t * m,
+  unsigned int index);
 
 /**
  * @brief gets all transitions based on a label
  * label is supposed to come from a rcl_state_t object
  */
 LIFECYCLE_EXPORT
-rcl_transition_array_t*
-rcl_get_transitions_by_label(rcl_transition_map_t* m, const char* label);
+rcl_transition_array_t *
+rcl_get_transitions_by_label(rcl_transition_map_t * m,
+  const char * label);
 /**
  * @brief gets all transitions based on a state
  * state is supposed to come from a rcl_state_t object
  */
 LIFECYCLE_EXPORT
-rcl_transition_array_t*
-rcl_get_transitions_by_index(rcl_transition_map_t* m, unsigned int index);
+rcl_transition_array_t *
+rcl_get_transitions_by_index(rcl_transition_map_t * m,
+  unsigned int index);
 
 /**
  * @brief helper functions to print
  */
 LIFECYCLE_EXPORT
 void
-rcl_print_transition_array(const rcl_transition_array_t* transition_array);
+rcl_print_transition_array(const rcl_transition_array_t * transition_array);
 LIFECYCLE_EXPORT
 void
-rcl_print_transition_map(const rcl_transition_map_t* m);
+rcl_print_transition_map(const rcl_transition_map_t * m);
 
 #if __cplusplus
 }
 #endif
 
-#endif  // RCL__TRANSITION_MAP_H_
+#endif  // RCL_LIFECYCLE__TRANSITION_MAP_H_

rclcpp_lifecycle/include/rcl_lifecycle/visibility_control.h

@@ -12,18 +12,18 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef RCL__LIFECYCLE_VISIBILITY_CONTROL_H_
-#define RCL__LIFECYCLE_VISIBILITY_CONTROL_H_
+#ifndef RCL_LIFECYCLE__VISIBILITY_CONTROL_H_
+#define RCL_LIFECYCLE__VISIBILITY_CONTROL_H_
 
 #ifdef _WIN32
-	#define shared_EXPORTS 1
-    #ifdef shared_EXPORTS
-        #define LIFECYCLE_EXPORT __declspec(dllexport)
-    #else
-        #define LIFECYCLE_EXPORT __declspec(dllimport)
-    #endif
+  #define shared_EXPORTS 1
+  #ifdef shared_EXPORTS
+    #define LIFECYCLE_EXPORT __declspec(dllexport)
+  #else
+    #define LIFECYCLE_EXPORT __declspec(dllimport)
+  #endif
 #else
-    #define LIFECYCLE_EXPORT
+  #define LIFECYCLE_EXPORT
 #endif
 
-#endif
+#endif  // RCL_LIFECYCLE__VISIBILITY_CONTROL_H_

rclcpp_lifecycle/include/rclcpp_lifecycle/lifecycle_executor.hpp

@@ -12,8 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef RCLCPP__LIFECYCLE_EXECUTOR_HPP_
-#define RCLCPP__LIFECYCLE_EXECUTOR_HPP_
+#ifndef RCLCPP_LIFECYCLE__LIFECYCLE_EXECUTOR_HPP_
+#define RCLCPP_LIFECYCLE__LIFECYCLE_EXECUTOR_HPP_
+
+#include <memory>
 
 #include "rclcpp/executors/single_threaded_executor.hpp"
 #include "rclcpp/type_traits/is_manageable_node.hpp"
@@ -26,21 +28,18 @@ namespace executors
 
 class LifecycleExecutor : public single_threaded_executor::SingleThreadedExecutor
 {
-//  using Node = rclcpp::node::Node;
-
 public:
-
-  explicit LifecycleExecutor(const executor::ExecutorArgs & args = executor::create_default_executor_arguments())
-    : SingleThreadedExecutor(args)
+  explicit LifecycleExecutor(const executor::ExecutorArgs & args =
+    executor::create_default_executor_arguments())
+  : SingleThreadedExecutor(args)
   {}
 
-  //RCLCPP_PUBLIC
   template<class T, typename std::enable_if<is_manageable_node<T>::value>::type>
   void
   add_node(std::shared_ptr<T> node_ptr, bool notify = true);
 };
 
-} // namespace executor
-} // namespace rclcpp
+}  // namespace executors
+}  // namespace rclcpp
 
-#endif
+#endif  // RCLCPP_LIFECYCLE__LIFECYCLE_EXECUTOR_HPP_