From 93677ef58f68978036a3b140890c662f97cf6979 Mon Sep 17 00:00:00 2001 From: Daniel Leung Date: Wed, 9 Aug 2023 12:43:56 -0700 Subject: [PATCH] settings: rename shadow variables Rename shadow variables found by -Wshadow. Signed-off-by: Daniel Leung --- subsys/settings/src/settings_fcb.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/subsys/settings/src/settings_fcb.c b/subsys/settings/src/settings_fcb.c index dbd98668a3e..3922c54fb08 100644 --- a/subsys/settings/src/settings_fcb.c +++ b/subsys/settings/src/settings_fcb.c @@ -158,13 +158,13 @@ static int settings_fcb_load_priv(struct settings_store *cs, while ((rc = fcb_getnext(&cf->cf_fcb, &entry_ctx.loc)) == 0) { char name[SETTINGS_MAX_NAME_LEN + SETTINGS_EXTRA_LEN + 1]; size_t name_len; - int rc; + int rc2; bool pass_entry = true; - rc = settings_line_name_read(name, sizeof(name), &name_len, + rc2 = settings_line_name_read(name, sizeof(name), &name_len, (void *)&entry_ctx); - if (rc) { - LOG_ERR("Failed to load line name: %d", rc); + if (rc2) { + LOG_ERR("Failed to load line name: %d", rc2); continue; } name[name_len] = '\0';