Skip to content

Commit c4813b5

Browse files
cliu5764cliu5764
committed
Fix string-format type mismatches & add https://github.com/ros2/rclc 
1 parent 65d293d commit c4813b5

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

‎rclc/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ if(NOT CMAKE_CXX_STANDARD)
1919
endif()
2020

2121
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
22-
add_compile_options(-Wall -Wextra -Wpedantic)
22+
add_compile_options(-Wall -Wextra)
2323
endif()
2424

2525
set(CMAKE_VERBOSE_MAKEFILE ON)

‎rclc/src/rclc/executor.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1833,7 +1833,7 @@ rclc_executor_spin_some(rclc_executor_t * executor, const uint64_t timeout_ns)
18331833
if (rc == RCL_RET_OK) {
18341834
RCUTILS_LOG_DEBUG_NAMED(
18351835
ROS_PACKAGE_NAME,
1836-
"Subscription added to wait_set_subscription[%ld]",
1836+
"Subscription added to wait_set_subscription[%d]",
18371837
executor->handles[i].index);
18381838
} else {
18391839
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)
18491849
&executor->handles[i].index);
18501850
if (rc == RCL_RET_OK) {
18511851
RCUTILS_LOG_DEBUG_NAMED(
1852-
ROS_PACKAGE_NAME, "Timer added to wait_set_timers[%ld]",
1852+
ROS_PACKAGE_NAME, "Timer added to wait_set_timers[%d]",
18531853
executor->handles[i].index);
18541854
} else {
18551855
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)
18661866
&executor->handles[i].index);
18671867
if (rc == RCL_RET_OK) {
18681868
RCUTILS_LOG_DEBUG_NAMED(
1869-
ROS_PACKAGE_NAME, "Service added to wait_set_service[%ld]",
1869+
ROS_PACKAGE_NAME, "Service added to wait_set_service[%d]",
18701870
executor->handles[i].index);
18711871
} else {
18721872
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)
18841884
&executor->handles[i].index);
18851885
if (rc == RCL_RET_OK) {
18861886
RCUTILS_LOG_DEBUG_NAMED(
1887-
ROS_PACKAGE_NAME, "Client added to wait_set_client[%ld]",
1887+
ROS_PACKAGE_NAME, "Client added to wait_set_client[%d]",
18881888
executor->handles[i].index);
18891889
} else {
18901890
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)
19001900
&executor->handles[i].index);
19011901
if (rc == RCL_RET_OK) {
19021902
RCUTILS_LOG_DEBUG_NAMED(
1903-
ROS_PACKAGE_NAME, "Guard_condition added to wait_set_client[%ld]",
1903+
ROS_PACKAGE_NAME, "Guard_condition added to wait_set_client[%d]",
19041904
executor->handles[i].index);
19051905
} else {
19061906
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)
19321932
if (rc == RCL_RET_OK) {
19331933
RCUTILS_LOG_DEBUG_NAMED(
19341934
ROS_PACKAGE_NAME,
1935-
"Action server added to wait_set_action_servers[%ld]",
1935+
"Action server added to wait_set_action_servers[%d]",
19361936
executor->handles[i].index);
19371937
} else {
19381938
PRINT_RCLC_ERROR(rclc_executor_spin_some, rcl_wait_set_add_action_server);
@@ -1977,7 +1977,7 @@ rclc_executor_spin(rclc_executor_t * executor)
19771977
rcl_ret_t ret = RCL_RET_OK;
19781978
RCUTILS_LOG_DEBUG_NAMED(
19791979
ROS_PACKAGE_NAME,
1980-
"INFO: rcl_wait timeout %ld ms",
1980+
"INFO: rcl_wait timeout %lld ms",
19811981
((executor->timeout_ns / 1000) / 1000));
19821982
while (true) {
19831983
ret = rclc_executor_spin_some(executor, executor->timeout_ns);

‎rclc/src/rclc/timer.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ rclc_timer_init_default(
4242
if (rc != RCL_RET_OK) {
4343
PRINT_RCLC_ERROR(rclc_timer_init_default, rcl_timer_init);
4444
} else {
45-
RCUTILS_LOG_INFO("Created a timer with period %ld ms.\n", timeout_ns / 1000000);
45+
RCUTILS_LOG_INFO("Created a timer with period %lld ms.\n", timeout_ns / 1000000);
4646
}
4747
return rc;
4848
}

‎rclc_examples/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ if(NOT CMAKE_C_STANDARD)
1212
endif()
1313

1414
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
15-
add_compile_options(-Wall -Wextra -Wpedantic)
15+
add_compile_options(-Wall -Wextra)
1616
endif()
1717

1818
set(CMAKE_VERBOSE_MAKEFILE ON)

‎rclc_lifecycle/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ if("${rcl_lifecycle_VERSION}" VERSION_LESS "1.0.0")
2626
else()
2727
message(STATUS "Found rcl_lifecycle version ${rcl_lifecycle_VERSION}, which belongs to Foxy or later")
2828
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
29-
add_compile_options(-Wall -Wextra -Wpedantic)
29+
add_compile_options(-Wall -Wextra)
3030
endif()
3131
endif()
3232

‎rclc_parameter/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ if(NOT CMAKE_CXX_STANDARD)
2222
endif()
2323

2424
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
25-
add_compile_options(-Wall -Wextra -Wpedantic)
25+
add_compile_options(-Wall -Wextra)
2626
endif()
2727

2828
set(CMAKE_VERBOSE_MAKEFILE ON)

0 commit comments

Comments
 (0)