From 076a070ce7fb0b70660a5aec7fb550d297501b3e Mon Sep 17 00:00:00 2001 From: Tomoya Fujita Date: Tue, 12 May 2026 01:51:35 +0900 Subject: [PATCH 1/3] address warning: statement with no effect. (#559) Signed-off-by: Tomoya Fujita (cherry picked from commit e04f58b43e153bf575ba89f44d946eb22676b61f) # Conflicts: # src/filesystem.c --- src/filesystem.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/filesystem.c b/src/filesystem.c index c88e74ae..5c9a4219 100644 --- a/src/filesystem.c +++ b/src/filesystem.c @@ -479,8 +479,12 @@ bool rcutils_dir_iter_next(rcutils_dir_iter_t * iter) { RCUTILS_CHECK_ARGUMENT_FOR_NULL(iter, false); +<<<<<<< HEAD rcutils_dir_iter_state_t * state = (rcutils_dir_iter_state_t *)iter->state; RCUTILS_CHECK_FOR_NULL_WITH_MSG(state, "iter is invalid", false); +======= + RCUTILS_CHECK_FOR_NULL_WITH_MSG(iter->state, "iter is invalid", return false); +>>>>>>> e04f58b (address warning: statement with no effect. (#559)) #ifdef _WIN32 if (FindNextFile(state->handle, &state->data)) { From 8466f0baf86a1793f753e016609cce5b98f981e8 Mon Sep 17 00:00:00 2001 From: "Tomoya.Fujita" Date: Tue, 12 May 2026 10:52:14 +0900 Subject: [PATCH 2/3] resolve conflict. Signed-off-by: Tomoya.Fujita --- src/filesystem.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/filesystem.c b/src/filesystem.c index 5c9a4219..c9a0d6b8 100644 --- a/src/filesystem.c +++ b/src/filesystem.c @@ -479,12 +479,7 @@ bool rcutils_dir_iter_next(rcutils_dir_iter_t * iter) { RCUTILS_CHECK_ARGUMENT_FOR_NULL(iter, false); -<<<<<<< HEAD - rcutils_dir_iter_state_t * state = (rcutils_dir_iter_state_t *)iter->state; - RCUTILS_CHECK_FOR_NULL_WITH_MSG(state, "iter is invalid", false); -======= RCUTILS_CHECK_FOR_NULL_WITH_MSG(iter->state, "iter is invalid", return false); ->>>>>>> e04f58b (address warning: statement with no effect. (#559)) #ifdef _WIN32 if (FindNextFile(state->handle, &state->data)) { From 8f7119f204060d4a8cd32c79f38233ee3e3d9f3e Mon Sep 17 00:00:00 2001 From: Alejandro Hernandez Cordero Date: Tue, 12 May 2026 22:46:17 +0200 Subject: [PATCH 3/3] fix Signed-off-by: Alejandro Hernandez Cordero --- src/filesystem.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/filesystem.c b/src/filesystem.c index c9a0d6b8..ddd68fbe 100644 --- a/src/filesystem.c +++ b/src/filesystem.c @@ -479,7 +479,8 @@ bool rcutils_dir_iter_next(rcutils_dir_iter_t * iter) { RCUTILS_CHECK_ARGUMENT_FOR_NULL(iter, false); - RCUTILS_CHECK_FOR_NULL_WITH_MSG(iter->state, "iter is invalid", return false); + rcutils_dir_iter_state_t * state = (rcutils_dir_iter_state_t *)iter->state; + RCUTILS_CHECK_FOR_NULL_WITH_MSG(state, "iter is invalid", return false); #ifdef _WIN32 if (FindNextFile(state->handle, &state->data)) {