settings: rename shadow variables

Rename shadow variables found by -Wshadow.

Signed-off-by: Daniel Leung <daniel.leung@intel.com>
This commit is contained in:
Daniel Leung 2023-08-09 12:43:56 -07:00 committed by Carles Cufí
parent 030223740f
commit 93677ef58f

View file

@ -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) { while ((rc = fcb_getnext(&cf->cf_fcb, &entry_ctx.loc)) == 0) {
char name[SETTINGS_MAX_NAME_LEN + SETTINGS_EXTRA_LEN + 1]; char name[SETTINGS_MAX_NAME_LEN + SETTINGS_EXTRA_LEN + 1];
size_t name_len; size_t name_len;
int rc; int rc2;
bool pass_entry = true; 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); (void *)&entry_ctx);
if (rc) { if (rc2) {
LOG_ERR("Failed to load line name: %d", rc); LOG_ERR("Failed to load line name: %d", rc2);
continue; continue;
} }
name[name_len] = '\0'; name[name_len] = '\0';