Fix string-format type mismatches & add https://github.com/ros2/rclc

ros2 · Feb 22, 2024 · c4813b5 · c4813b5
1 parent 65d293d
commit c4813b5
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/rclc/CMakeLists.txt b/rclc/CMakeLists.txt
@@ -19,7 +19,7 @@ if(NOT CMAKE_CXX_STANDARD)
 endif()
 
 if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-  add_compile_options(-Wall -Wextra -Wpedantic)
+  add_compile_options(-Wall -Wextra)
 endif()
 
 set(CMAKE_VERBOSE_MAKEFILE ON)

diff --git a/rclc/src/rclc/executor.c b/rclc/src/rclc/executor.c
@@ -1833,7 +1833,7 @@ rclc_executor_spin_some(rclc_executor_t * executor, const uint64_t timeout_ns)
         if (rc == RCL_RET_OK) {
           RCUTILS_LOG_DEBUG_NAMED(
             ROS_PACKAGE_NAME,
-            "Subscription added to wait_set_subscription[%ld]",
+            "Subscription added to wait_set_subscription[%d]",
             executor->handles[i].index);
         } else {
           PRINT_RCLC_ERROR(rclc_executor_spin_some, rcl_wait_set_add_subscription);
@@ -1849,7 +1849,7 @@ rclc_executor_spin_some(rclc_executor_t * executor, const uint64_t timeout_ns)
           &executor->handles[i].index);
         if (rc == RCL_RET_OK) {
           RCUTILS_LOG_DEBUG_NAMED(
-            ROS_PACKAGE_NAME, "Timer added to wait_set_timers[%ld]",
+            ROS_PACKAGE_NAME, "Timer added to wait_set_timers[%d]",
             executor->handles[i].index);
         } else {
           PRINT_RCLC_ERROR(rclc_executor_spin_some, rcl_wait_set_add_timer);
@@ -1866,7 +1866,7 @@ rclc_executor_spin_some(rclc_executor_t * executor, const uint64_t timeout_ns)
           &executor->handles[i].index);
         if (rc == RCL_RET_OK) {
           RCUTILS_LOG_DEBUG_NAMED(
-            ROS_PACKAGE_NAME, "Service added to wait_set_service[%ld]",
+            ROS_PACKAGE_NAME, "Service added to wait_set_service[%d]",
             executor->handles[i].index);
         } else {
           PRINT_RCLC_ERROR(rclc_executor_spin_some, rcl_wait_set_add_service);
@@ -1884,7 +1884,7 @@ rclc_executor_spin_some(rclc_executor_t * executor, const uint64_t timeout_ns)
           &executor->handles[i].index);
         if (rc == RCL_RET_OK) {
           RCUTILS_LOG_DEBUG_NAMED(
-            ROS_PACKAGE_NAME, "Client added to wait_set_client[%ld]",
+            ROS_PACKAGE_NAME, "Client added to wait_set_client[%d]",
             executor->handles[i].index);
         } else {
           PRINT_RCLC_ERROR(rclc_executor_spin_some, rcl_wait_set_add_client);
@@ -1900,7 +1900,7 @@ rclc_executor_spin_some(rclc_executor_t * executor, const uint64_t timeout_ns)
           &executor->handles[i].index);
         if (rc == RCL_RET_OK) {
           RCUTILS_LOG_DEBUG_NAMED(
-            ROS_PACKAGE_NAME, "Guard_condition added to wait_set_client[%ld]",
+            ROS_PACKAGE_NAME, "Guard_condition added to wait_set_client[%d]",
             executor->handles[i].index);
         } else {
           PRINT_RCLC_ERROR(rclc_executor_spin_some, rcl_wait_set_add_guard_condition);
@@ -1932,7 +1932,7 @@ rclc_executor_spin_some(rclc_executor_t * executor, const uint64_t timeout_ns)
         if (rc == RCL_RET_OK) {
           RCUTILS_LOG_DEBUG_NAMED(
             ROS_PACKAGE_NAME,
-            "Action server added to wait_set_action_servers[%ld]",
+            "Action server added to wait_set_action_servers[%d]",
             executor->handles[i].index);
         } else {
           PRINT_RCLC_ERROR(rclc_executor_spin_some, rcl_wait_set_add_action_server);
@@ -1977,7 +1977,7 @@ rclc_executor_spin(rclc_executor_t * executor)
   rcl_ret_t ret = RCL_RET_OK;
   RCUTILS_LOG_DEBUG_NAMED(
     ROS_PACKAGE_NAME,
-    "INFO: rcl_wait timeout %ld ms",
+    "INFO: rcl_wait timeout %lld ms",
     ((executor->timeout_ns / 1000) / 1000));
   while (true) {
     ret = rclc_executor_spin_some(executor, executor->timeout_ns);

diff --git a/rclc/src/rclc/timer.c b/rclc/src/rclc/timer.c
@@ -42,7 +42,7 @@ rclc_timer_init_default(
   if (rc != RCL_RET_OK) {
     PRINT_RCLC_ERROR(rclc_timer_init_default, rcl_timer_init);
   } else {
-    RCUTILS_LOG_INFO("Created a timer with period %ld ms.\n", timeout_ns / 1000000);
+    RCUTILS_LOG_INFO("Created a timer with period %lld ms.\n", timeout_ns / 1000000);
   }
   return rc;
 }
diff --git a/rclc_examples/CMakeLists.txt b/rclc_examples/CMakeLists.txt
@@ -12,7 +12,7 @@ if(NOT CMAKE_C_STANDARD)
 endif()
 
 if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-  add_compile_options(-Wall -Wextra -Wpedantic)
+  add_compile_options(-Wall -Wextra)
 endif()
 
 set(CMAKE_VERBOSE_MAKEFILE ON)

diff --git a/rclc_lifecycle/CMakeLists.txt b/rclc_lifecycle/CMakeLists.txt
@@ -26,7 +26,7 @@ if("${rcl_lifecycle_VERSION}" VERSION_LESS "1.0.0")
 else()
   message(STATUS "Found rcl_lifecycle version ${rcl_lifecycle_VERSION}, which belongs to Foxy or later")
   if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    add_compile_options(-Wall -Wextra -Wpedantic)
+    add_compile_options(-Wall -Wextra)
   endif()
 endif()
 

diff --git a/rclc_parameter/CMakeLists.txt b/rclc_parameter/CMakeLists.txt
@@ -22,7 +22,7 @@ if(NOT CMAKE_CXX_STANDARD)
 endif()
 
 if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-  add_compile_options(-Wall -Wextra -Wpedantic)
+  add_compile_options(-Wall -Wextra)
 endif()
 
 set(CMAKE_VERBOSE_MAKEFILE ON)