From 2699b933b94b5889b496259c86545280eb336d1f Mon Sep 17 00:00:00 2001 From: Tomoya Fujita Date: Tue, 12 May 2026 01:51:35 +0900 Subject: [PATCH 1/4] 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 d764f99c..0bc7a704 100644 --- a/src/filesystem.c +++ b/src/filesystem.c @@ -480,8 +480,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 6723fe41da729e42db58e54ae3d5d9883ecbac3a Mon Sep 17 00:00:00 2001 From: "Tomoya.Fujita" Date: Tue, 12 May 2026 10:49:38 +0900 Subject: [PATCH 2/4] 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 0bc7a704..8ac19ed8 100644 --- a/src/filesystem.c +++ b/src/filesystem.c @@ -480,12 +480,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 64b1742dba5429a59cb4ec415f8bcf711c85cb40 Mon Sep 17 00:00:00 2001 From: Alejandro Hernandez Cordero Date: Tue, 12 May 2026 22:45:08 +0200 Subject: [PATCH 3/4] fix Signed-off-by: Alejandro Hernandez Cordero --- src/filesystem.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/filesystem.c b/src/filesystem.c index 8ac19ed8..6d2f7c93 100644 --- a/src/filesystem.c +++ b/src/filesystem.c @@ -480,8 +480,9 @@ 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)) { iter->entry_name = state->data.cFileName; From 86811e032f914fa697c7e6fa281c49919505960f Mon Sep 17 00:00:00 2001 From: Alejandro Hernandez Cordero Date: Tue, 12 May 2026 22:45:34 +0200 Subject: [PATCH 4/4] fix Signed-off-by: Alejandro Hernandez Cordero --- src/filesystem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/filesystem.c b/src/filesystem.c index 6d2f7c93..681e7665 100644 --- a/src/filesystem.c +++ b/src/filesystem.c @@ -482,7 +482,7 @@ rcutils_dir_iter_next(rcutils_dir_iter_t * iter) RCUTILS_CHECK_ARGUMENT_FOR_NULL(iter, 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)) { iter->entry_name = state->data.cFileName;