From 8bfdb23a0845becbc8f6eb6332ede86b89cb070c Mon Sep 17 00:00:00 2001 From: Daniel Leung Date: Mon, 7 Aug 2023 16:57:45 -0700 Subject: [PATCH] logging: rename shadow variables Rename shadow variables found by -Wshadow. Signed-off-by: Daniel Leung --- subsys/logging/backends/log_backend_fs.c | 6 +++--- subsys/logging/log_frontend_dict_uart.c | 16 ++++++++-------- subsys/logging/log_output_syst.c | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/subsys/logging/backends/log_backend_fs.c b/subsys/logging/backends/log_backend_fs.c index 8b1ea4f6088..f12ba05adda 100644 --- a/subsys/logging/backends/log_backend_fs.c +++ b/subsys/logging/backends/log_backend_fs.c @@ -24,7 +24,7 @@ enum backend_fs_state { BACKEND_FS_OK }; -static struct fs_file_t file; +static struct fs_file_t fs_file; static enum backend_fs_state backend_state = BACKEND_FS_NOT_INITIALIZED; static int file_ctr, newest, oldest; @@ -149,7 +149,7 @@ close_dir: int write_log_to_file(uint8_t *data, size_t length, void *ctx) { int rc; - struct fs_file_t *f = &file; + struct fs_file_t *f = &fs_file; if (backend_state == BACKEND_FS_NOT_INITIALIZED) { if (check_log_volumen_available()) { @@ -157,7 +157,7 @@ int write_log_to_file(uint8_t *data, size_t length, void *ctx) } rc = create_log_dir(CONFIG_LOG_BACKEND_FS_DIR); if (!rc) { - rc = allocate_new_file(&file); + rc = allocate_new_file(&fs_file); } backend_state = (rc ? BACKEND_FS_CORRUPTED : BACKEND_FS_OK); } diff --git a/subsys/logging/log_frontend_dict_uart.c b/subsys/logging/log_frontend_dict_uart.c index 4aed4e8fb3a..5689ccdc560 100644 --- a/subsys/logging/log_frontend_dict_uart.c +++ b/subsys/logging/log_frontend_dict_uart.c @@ -64,7 +64,7 @@ static const struct mpsc_pbuf_buffer_config config = { .get_wlen = get_wlen, .flags = 0 }; -static const struct device *const dev = DEVICE_DT_GET(DT_CHOSEN(zephyr_console)); +static const struct device *const uart_dev = DEVICE_DT_GET(DT_CHOSEN(zephyr_console)); static struct mpsc_pbuf_buffer buf; static atomic_t active_cnt; /* Counts number of buffered messages. */ @@ -97,7 +97,7 @@ static void tx(void) struct log_frontend_uart_generic_pkt *pkt; if (!IS_ENABLED(CONFIG_UART_ASYNC_API) && !in_panic) { - uart_irq_tx_enable(dev); + uart_irq_tx_enable(uart_dev); return; } @@ -110,11 +110,11 @@ static void tx(void) if (in_panic) { for (int i = 0; i < len; i++) { - uart_poll_out(dev, pkt->data[i]); + uart_poll_out(uart_dev, pkt->data[i]); } atomic_dec(&active_cnt); } else { - int err = uart_tx(dev, pkt->data, len, SYS_FOREVER_US); + int err = uart_tx(uart_dev, pkt->data, len, SYS_FOREVER_US); (void)err; __ASSERT_NO_MSG(err == 0); @@ -251,7 +251,7 @@ static void sync_msg(const void *source, for (int i = 0; i < ARRAY_SIZE(datas); i++) { for (int j = 0; j < len[i]; j++) { - uart_poll_out(dev, datas[i][j]); + uart_poll_out(uart_dev, datas[i][j]); } } } @@ -266,7 +266,7 @@ void log_frontend_msg(const void *source, CBPRINTF_PACKAGE_CONVERT_RW_STR, strl, ARRAY_SIZE(strl)); size_t dlen = desc.data_len; - bool dev_ready = device_is_ready(dev); + bool dev_ready = device_is_ready(uart_dev); size_t total_len = plen + dlen + sizeof(struct log_frontend_uart_pkt); size_t total_wlen = DIV_ROUND_UP(total_len, sizeof(uint32_t)); @@ -326,9 +326,9 @@ void log_frontend_init(void) int err; if (IS_ENABLED(CONFIG_UART_ASYNC_API)) { - err = uart_callback_set(dev, uart_callback, NULL); + err = uart_callback_set(uart_dev, uart_callback, NULL); } else if (IS_ENABLED(CONFIG_UART_INTERRUPT_DRIVEN)) { - uart_irq_callback_user_data_set(dev, uart_isr_callback, NULL); + uart_irq_callback_user_data_set(uart_dev, uart_isr_callback, NULL); err = 0; } diff --git a/subsys/logging/log_output_syst.c b/subsys/logging/log_output_syst.c index be0ee91cb20..34ca034ee12 100644 --- a/subsys/logging/log_output_syst.c +++ b/subsys/logging/log_output_syst.c @@ -847,9 +847,9 @@ void log_output_msg_syst_process(const struct log_output *output, #endif { #ifdef CONFIG_CBPRINTF_PACKAGE_HEADER_STORE_CREATION_FLAGS - struct cbprintf_package_desc *pkg_hdr = (void *)data; + struct cbprintf_package_desc *pkg_desc = (void *)data; - CHECKIF((pkg_hdr->pkg_flags & CBPRINTF_PACKAGE_ARGS_ARE_TAGGED) == + CHECKIF((pkg_desc->pkg_flags & CBPRINTF_PACKAGE_ARGS_ARE_TAGGED) == CBPRINTF_PACKAGE_ARGS_ARE_TAGGED) { /* * Tagged arguments are to be used with catalog messages,