From 3363586cbbf507937a6be74397f4ffd5c6966fe5 Mon Sep 17 00:00:00 2001 From: dongly Date: Wed, 3 Aug 2022 00:09:49 +0800 Subject: [PATCH] Fix some compilation warning (#5744) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fix some compilation warning * 补充修正一些数据类型的使用错误 Co-authored-by: Meco Man <920369182@qq.com> --- .../HAL_Drivers/drv_flash/drv_flash_f4.c | 47 +++++++++++++++++-- bsp/stm32/libraries/HAL_Drivers/drv_gpio.c | 30 ++++++------ .../libraries/HAL_Drivers/drv_soft_i2c.c | 5 +- bsp/stm32/libraries/HAL_Drivers/drv_spi.c | 5 +- bsp/stm32/libraries/HAL_Drivers/drv_usart.c | 5 +- components/dfs/filesystems/romfs/dfs_romfs.c | 7 +-- components/dfs/filesystems/romfs/romfs.c | 8 ++-- components/dfs/src/dfs.c | 8 ++-- components/drivers/i2c/i2c-bit-ops.c | 6 ++- components/drivers/i2c/i2c_core.c | 6 +-- components/drivers/serial/serial.c | 10 ++-- components/fal/src/fal_rtt.c | 6 +-- components/net/netdev/src/netdev.c | 14 +++--- components/net/sal/src/sal_socket.c | 7 +-- libcpu/arm/common/showmem.c | 4 +- src/kservice.c | 2 +- src/mem.c | 6 ++- src/timer.c | 2 +- 18 files changed, 113 insertions(+), 65 deletions(-) diff --git a/bsp/stm32/libraries/HAL_Drivers/drv_flash/drv_flash_f4.c b/bsp/stm32/libraries/HAL_Drivers/drv_flash/drv_flash_f4.c index 9e308d45ac..afca990fb6 100644 --- a/bsp/stm32/libraries/HAL_Drivers/drv_flash/drv_flash_f4.c +++ b/bsp/stm32/libraries/HAL_Drivers/drv_flash/drv_flash_f4.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2021, RT-Thread Development Team + * Copyright (c) 2006-2022, RT-Thread Development Team * * SPDX-License-Identifier: Apache-2.0 * @@ -373,9 +373,48 @@ static int fal_flash_erase_16k(long offset, size_t size); static int fal_flash_erase_64k(long offset, size_t size); static int fal_flash_erase_128k(long offset, size_t size); -const struct fal_flash_dev stm32_onchip_flash_16k = { "onchip_flash_16k", STM32_FLASH_START_ADRESS_16K, FLASH_SIZE_GRANULARITY_16K, (16 * 1024), {NULL, fal_flash_read_16k, fal_flash_write_16k, fal_flash_erase_16k} }; -const struct fal_flash_dev stm32_onchip_flash_64k = { "onchip_flash_64k", STM32_FLASH_START_ADRESS_64K, FLASH_SIZE_GRANULARITY_64K, (64 * 1024), {NULL, fal_flash_read_64k, fal_flash_write_64k, fal_flash_erase_64k} }; -const struct fal_flash_dev stm32_onchip_flash_128k = { "onchip_flash_128k", STM32_FLASH_START_ADRESS_128K, FLASH_SIZE_GRANULARITY_128K, (128 * 1024), {NULL, fal_flash_read_128k, fal_flash_write_128k, fal_flash_erase_128k} }; +const struct fal_flash_dev stm32_onchip_flash_16k = +{ + "onchip_flash_16k", + STM32_FLASH_START_ADRESS_16K, + FLASH_SIZE_GRANULARITY_16K, + (16 * 1024), + { + NULL, + fal_flash_read_16k, + fal_flash_write_16k, + fal_flash_erase_16k, + }, + 8, +}; +const struct fal_flash_dev stm32_onchip_flash_64k = +{ + "onchip_flash_64k", + STM32_FLASH_START_ADRESS_64K, + FLASH_SIZE_GRANULARITY_64K, + (64 * 1024), + { + NULL, + fal_flash_read_64k, + fal_flash_write_64k, + fal_flash_erase_64k, + }, + 8, +}; +const struct fal_flash_dev stm32_onchip_flash_128k = +{ + "onchip_flash_128k", + STM32_FLASH_START_ADRESS_128K, + FLASH_SIZE_GRANULARITY_128K, + (128 * 1024), + { + NULL, + fal_flash_read_128k, + fal_flash_write_128k, + fal_flash_erase_128k, + }, + 8, +}; static int fal_flash_read_16k(long offset, rt_uint8_t *buf, size_t size) { diff --git a/bsp/stm32/libraries/HAL_Drivers/drv_gpio.c b/bsp/stm32/libraries/HAL_Drivers/drv_gpio.c index b50819f579..9bd517e83c 100644 --- a/bsp/stm32/libraries/HAL_Drivers/drv_gpio.c +++ b/bsp/stm32/libraries/HAL_Drivers/drv_gpio.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2021, RT-Thread Development Team + * Copyright (c) 2006-2022, RT-Thread Development Team * * SPDX-License-Identifier: Apache-2.0 * @@ -159,7 +159,7 @@ static struct rt_pin_irq_hdr pin_irq_hdr_tab[] = }; static uint32_t pin_irq_enable_mask = 0; -#define ITEM_NUM(items) sizeof(items) / sizeof(items[0]) +#define ITEM_NUM(items) (sizeof(items) / sizeof((items)[0])) /* e.g. PE.7 */ static rt_base_t stm32_pin_get(const char *name) @@ -280,10 +280,10 @@ static void stm32_pin_mode(rt_device_t dev, rt_base_t pin, rt_base_t mode) rt_inline rt_int32_t bit2bitno(rt_uint32_t bit) { - rt_uint8_t i; + rt_int32_t i; for (i = 0; i < 32; i++) { - if ((0x01 << i) == bit) + if (((rt_uint32_t)0x01 << i) == bit) { return i; } @@ -294,7 +294,7 @@ rt_inline rt_int32_t bit2bitno(rt_uint32_t bit) rt_inline const struct pin_irq_map *get_pin_irq_map(uint32_t pinbit) { rt_int32_t mapindex = bit2bitno(pinbit); - if (mapindex < 0 || mapindex >= ITEM_NUM(pin_irq_map)) + if (mapindex < 0 || mapindex >= (rt_int32_t)ITEM_NUM(pin_irq_map)) { return RT_NULL; } @@ -313,9 +313,9 @@ static rt_err_t stm32_pin_attach_irq(struct rt_device *device, rt_int32_t pin, } irqindex = bit2bitno(PIN_STPIN(pin)); - if (irqindex < 0 || irqindex >= ITEM_NUM(pin_irq_map)) + if (irqindex < 0 || irqindex >= (rt_int32_t)ITEM_NUM(pin_irq_map)) { - return RT_ENOSYS; + return -RT_ENOSYS; } level = rt_hw_interrupt_disable(); @@ -330,7 +330,7 @@ static rt_err_t stm32_pin_attach_irq(struct rt_device *device, rt_int32_t pin, if (pin_irq_hdr_tab[irqindex].pin != -1) { rt_hw_interrupt_enable(level); - return RT_EBUSY; + return -RT_EBUSY; } pin_irq_hdr_tab[irqindex].pin = pin; pin_irq_hdr_tab[irqindex].hdr = hdr; @@ -352,9 +352,9 @@ static rt_err_t stm32_pin_dettach_irq(struct rt_device *device, rt_int32_t pin) } irqindex = bit2bitno(PIN_STPIN(pin)); - if (irqindex < 0 || irqindex >= ITEM_NUM(pin_irq_map)) + if (irqindex < 0 || irqindex >= (rt_int32_t)ITEM_NUM(pin_irq_map)) { - return RT_ENOSYS; + return -RT_ENOSYS; } level = rt_hw_interrupt_disable(); @@ -388,9 +388,9 @@ static rt_err_t stm32_pin_irq_enable(struct rt_device *device, rt_base_t pin, if (enabled == PIN_IRQ_ENABLE) { irqindex = bit2bitno(PIN_STPIN(pin)); - if (irqindex < 0 || irqindex >= ITEM_NUM(pin_irq_map)) + if (irqindex < 0 || irqindex >= (rt_int32_t)ITEM_NUM(pin_irq_map)) { - return RT_ENOSYS; + return -RT_ENOSYS; } level = rt_hw_interrupt_disable(); @@ -398,7 +398,7 @@ static rt_err_t stm32_pin_irq_enable(struct rt_device *device, rt_base_t pin, if (pin_irq_hdr_tab[irqindex].pin == -1) { rt_hw_interrupt_enable(level); - return RT_ENOSYS; + return -RT_ENOSYS; } irqmap = &pin_irq_map[irqindex]; @@ -434,7 +434,7 @@ static rt_err_t stm32_pin_irq_enable(struct rt_device *device, rt_base_t pin, irqmap = get_pin_irq_map(PIN_STPIN(pin)); if (irqmap == RT_NULL) { - return RT_ENOSYS; + return -RT_ENOSYS; } level = rt_hw_interrupt_disable(); @@ -498,7 +498,7 @@ static rt_err_t stm32_pin_irq_enable(struct rt_device *device, rt_base_t pin, return RT_EOK; } -const static struct rt_pin_ops _stm32_pin_ops = +static const struct rt_pin_ops _stm32_pin_ops = { stm32_pin_mode, stm32_pin_write, diff --git a/bsp/stm32/libraries/HAL_Drivers/drv_soft_i2c.c b/bsp/stm32/libraries/HAL_Drivers/drv_soft_i2c.c index c284e3d965..f998ef81b6 100644 --- a/bsp/stm32/libraries/HAL_Drivers/drv_soft_i2c.c +++ b/bsp/stm32/libraries/HAL_Drivers/drv_soft_i2c.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2021, RT-Thread Development Team + * Copyright (c) 2006-2022, RT-Thread Development Team * * SPDX-License-Identifier: Apache-2.0 * @@ -195,10 +195,9 @@ static rt_err_t stm32_i2c_bus_unlock(const struct stm32_soft_i2c_config *cfg) /* I2C initialization function */ int rt_hw_i2c_init(void) { - rt_size_t obj_num = sizeof(i2c_obj) / sizeof(struct stm32_i2c); rt_err_t result; - for (int i = 0; i < obj_num; i++) + for (rt_size_t i = 0; i < sizeof(i2c_obj) / sizeof(struct stm32_i2c); i++) { i2c_obj[i].ops = stm32_bit_ops_default; i2c_obj[i].ops.data = (void*)&soft_i2c_config[i]; diff --git a/bsp/stm32/libraries/HAL_Drivers/drv_spi.c b/bsp/stm32/libraries/HAL_Drivers/drv_spi.c index 2713b4afc1..9c3a2b4993 100644 --- a/bsp/stm32/libraries/HAL_Drivers/drv_spi.c +++ b/bsp/stm32/libraries/HAL_Drivers/drv_spi.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2021, RT-Thread Development Team + * Copyright (c) 2006-2022, RT-Thread Development Team * * SPDX-License-Identifier: Apache-2.0 * @@ -446,7 +446,8 @@ static const struct rt_spi_ops stm_spi_ops = static int rt_hw_spi_bus_init(void) { rt_err_t result; - for (int i = 0; i < sizeof(spi_config) / sizeof(spi_config[0]); i++) + + for (rt_size_t i = 0; i < sizeof(spi_config) / sizeof(spi_config[0]); i++) { spi_bus_obj[i].config = &spi_config[i]; spi_bus_obj[i].spi_bus.parent.user_data = &spi_config[i]; diff --git a/bsp/stm32/libraries/HAL_Drivers/drv_usart.c b/bsp/stm32/libraries/HAL_Drivers/drv_usart.c index a8142fb154..63644bc719 100644 --- a/bsp/stm32/libraries/HAL_Drivers/drv_usart.c +++ b/bsp/stm32/libraries/HAL_Drivers/drv_usart.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2021, RT-Thread Development Team + * Copyright (c) 2006-2022, RT-Thread Development Team * * SPDX-License-Identifier: Apache-2.0 * @@ -1156,13 +1156,12 @@ static const struct rt_uart_ops stm32_uart_ops = int rt_hw_usart_init(void) { - rt_size_t obj_num = sizeof(uart_obj) / sizeof(struct stm32_uart); struct serial_configure config = RT_SERIAL_CONFIG_DEFAULT; rt_err_t result = 0; stm32_uart_get_dma_config(); - for (int i = 0; i < obj_num; i++) + for (rt_size_t i = 0; i < sizeof(uart_obj) / sizeof(struct stm32_uart); i++) { /* init UART object */ uart_obj[i].config = &uart_config[i]; diff --git a/components/dfs/filesystems/romfs/dfs_romfs.c b/components/dfs/filesystems/romfs/dfs_romfs.c index 9e355471a8..1a467be242 100644 --- a/components/dfs/filesystems/romfs/dfs_romfs.c +++ b/components/dfs/filesystems/romfs/dfs_romfs.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2021, RT-Thread Development Team + * Copyright (c) 2006-2022, RT-Thread Development Team * * SPDX-License-Identifier: Apache-2.0 * @@ -40,7 +40,7 @@ int dfs_romfs_ioctl(struct dfs_fd *file, int cmd, void *args) rt_inline int check_dirent(struct romfs_dirent *dirent) { if ((dirent->type != ROMFS_DIRENT_FILE && dirent->type != ROMFS_DIRENT_DIR) - || dirent->size == ~0) + || dirent->size == ~0U) return -1; return 0; } @@ -84,7 +84,7 @@ struct romfs_dirent *dfs_romfs_lookup(struct romfs_dirent *root_dirent, const ch { if (check_dirent(&dirent[index]) != 0) return NULL; - if (rt_strlen(dirent[index].name) == (subpath_end - subpath) && + if (rt_strlen(dirent[index].name) == (rt_size_t)(subpath_end - subpath) && rt_strncmp(dirent[index].name, subpath, (subpath_end - subpath)) == 0) { dirent_size = dirent[index].size; @@ -295,6 +295,7 @@ static const struct dfs_file_ops _rom_fops = NULL, dfs_romfs_lseek, dfs_romfs_getdents, + NULL, }; static const struct dfs_filesystem_ops _romfs = { diff --git a/components/dfs/filesystems/romfs/romfs.c b/components/dfs/filesystems/romfs/romfs.c index 847fcc6e27..6897c23d5c 100644 --- a/components/dfs/filesystems/romfs/romfs.c +++ b/components/dfs/filesystems/romfs/romfs.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2021, RT-Thread Development Team + * Copyright (c) 2006-2022, RT-Thread Development Team * * SPDX-License-Identifier: Apache-2.0 * @@ -10,17 +10,17 @@ #include #include -const static unsigned char _dummy_dummy_txt[] = +static const unsigned char _dummy_dummy_txt[] = { 0x74, 0x68, 0x69, 0x73, 0x20, 0x69, 0x73, 0x20, 0x61, 0x20, 0x66, 0x69, 0x6c, 0x65, 0x21, 0x0d, 0x0a, }; -const static struct romfs_dirent _dummy[] = +static const struct romfs_dirent _dummy[] = { {ROMFS_DIRENT_FILE, "dummy.txt", _dummy_dummy_txt, sizeof(_dummy_dummy_txt)}, }; -const static unsigned char _dummy_txt[] = +static const unsigned char _dummy_txt[] = { 0x74, 0x68, 0x69, 0x73, 0x20, 0x69, 0x73, 0x20, 0x61, 0x20, 0x66, 0x69, 0x6c, 0x65, 0x21, 0x0d, 0x0a, }; diff --git a/components/dfs/src/dfs.c b/components/dfs/src/dfs.c index 23cac5c9e9..5c542fdc9b 100644 --- a/components/dfs/src/dfs.c +++ b/components/dfs/src/dfs.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2021, RT-Thread Development Team + * Copyright (c) 2006-2022, RT-Thread Development Team * * SPDX-License-Identifier: Apache-2.0 * @@ -132,7 +132,7 @@ static int fd_alloc(struct dfs_fdtable *fdt, int startfd) } /* allocate a larger FD container */ - if (idx == fdt->maxfd && fdt->maxfd < DFS_FD_MAX) + if (idx == (int)fdt->maxfd && fdt->maxfd < DFS_FD_MAX) { int cnt, index; struct dfs_fd **fds; @@ -145,7 +145,7 @@ static int fd_alloc(struct dfs_fdtable *fdt, int startfd) if (fds == NULL) goto __exit; /* return fdt->maxfd */ /* clean the new allocated fds */ - for (index = fdt->maxfd; index < cnt; index ++) + for (index = (int)fdt->maxfd; index < cnt; index ++) { fds[index] = NULL; } @@ -186,7 +186,7 @@ int fd_new(void) idx = fd_alloc(fdt, 0); /* can't find an empty fd entry */ - if (idx == fdt->maxfd) + if (idx == (int)fdt->maxfd) { idx = -(1 + DFS_FD_OFFSET); LOG_E("DFS fd new is failed! Could not found an empty fd entry."); diff --git a/components/drivers/i2c/i2c-bit-ops.c b/components/drivers/i2c/i2c-bit-ops.c index ae1f4db9c0..08fa5a836c 100644 --- a/components/drivers/i2c/i2c-bit-ops.c +++ b/components/drivers/i2c/i2c-bit-ops.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2021, RT-Thread Development Team + * Copyright (c) 2006-2022, RT-Thread Development Team * * SPDX-License-Identifier: Apache-2.0 * @@ -404,7 +404,9 @@ static rt_size_t i2c_bit_xfer(struct rt_i2c_bus_device *bus, { ret = i2c_recv_bytes(bus, msg); if (ret >= 1) + { LOG_D("read %d byte%s", ret, ret == 1 ? "" : "s"); + } if (ret < msg->len) { if (ret >= 0) @@ -416,7 +418,9 @@ static rt_size_t i2c_bit_xfer(struct rt_i2c_bus_device *bus, { ret = i2c_send_bytes(bus, msg); if (ret >= 1) + { LOG_D("write %d byte%s", ret, ret == 1 ? "" : "s"); + } if (ret < msg->len) { if (ret >= 0) diff --git a/components/drivers/i2c/i2c_core.c b/components/drivers/i2c/i2c_core.c index c629765f65..39147be605 100644 --- a/components/drivers/i2c/i2c_core.c +++ b/components/drivers/i2c/i2c_core.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2021, RT-Thread Development Team + * Copyright (c) 2006-2022, RT-Thread Development Team * * SPDX-License-Identifier: Apache-2.0 * @@ -108,7 +108,7 @@ rt_size_t rt_i2c_master_send(struct rt_i2c_bus_device *bus, const rt_uint8_t *buf, rt_uint32_t count) { - rt_err_t ret; + rt_size_t ret; struct rt_i2c_msg msg; msg.addr = addr; @@ -127,7 +127,7 @@ rt_size_t rt_i2c_master_recv(struct rt_i2c_bus_device *bus, rt_uint8_t *buf, rt_uint32_t count) { - rt_err_t ret; + rt_size_t ret; struct rt_i2c_msg msg; RT_ASSERT(bus != RT_NULL); diff --git a/components/drivers/serial/serial.c b/components/drivers/serial/serial.c index d39acb298f..00d6671f37 100644 --- a/components/drivers/serial/serial.c +++ b/components/drivers/serial/serial.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2021, RT-Thread Development Team + * Copyright (c) 2006-2022, RT-Thread Development Team * * SPDX-License-Identifier: Apache-2.0 * @@ -200,7 +200,7 @@ static int serial_fops_poll(struct dfs_fd *fd, struct rt_pollreq *req) return mask; } -const static struct dfs_file_ops _serial_fops = +static const struct dfs_file_ops _serial_fops = { serial_fops_open, serial_fops_close, @@ -900,7 +900,7 @@ struct speed_baudrate_item int baudrate; }; -const static struct speed_baudrate_item _tbl[] = +static const struct speed_baudrate_item _tbl[] = { {B2400, BAUD_RATE_2400}, {B4800, BAUD_RATE_4800}, @@ -918,7 +918,7 @@ const static struct speed_baudrate_item _tbl[] = static speed_t _get_speed(int baudrate) { - int index; + size_t index; for (index = 0; index < sizeof(_tbl)/sizeof(_tbl[0]); index ++) { @@ -931,7 +931,7 @@ static speed_t _get_speed(int baudrate) static int _get_baudrate(speed_t speed) { - int index; + size_t index; for (index = 0; index < sizeof(_tbl)/sizeof(_tbl[0]); index ++) { diff --git a/components/fal/src/fal_rtt.c b/components/fal/src/fal_rtt.c index 3a014525b2..52d276d8c9 100644 --- a/components/fal/src/fal_rtt.c +++ b/components/fal/src/fal_rtt.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2018, RT-Thread Development Team + * Copyright (c) 2006-2022, RT-Thread Development Team * * SPDX-License-Identifier: Apache-2.0 * @@ -264,7 +264,7 @@ static rt_err_t mtd_nor_dev_erase(struct rt_mtd_nor_device* device, rt_off_t off ret = fal_partition_erase(part->fal_part, offset, length); - if (ret != length) + if ((rt_uint32_t)ret != length || ret < 0) { return -RT_ERROR; } @@ -556,7 +556,7 @@ static void fal(uint8_t argc, char **argv) { #define CMD_ERASE_INDEX 3 #define CMD_BENCH_INDEX 4 - int result; + int result = 0; static const struct fal_flash_dev *flash_dev = NULL; static const struct fal_partition *part_dev = NULL; size_t i = 0, j = 0; diff --git a/components/net/netdev/src/netdev.c b/components/net/netdev/src/netdev.c index 1009ace8d6..22be799ccc 100644 --- a/components/net/netdev/src/netdev.c +++ b/components/net/netdev/src/netdev.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2021, RT-Thread Development Team + * Copyright (c) 2006-2022, RT-Thread Development Team * * SPDX-License-Identifier: Apache-2.0 * @@ -28,9 +28,9 @@ #include /* The list of network interface device */ -struct netdev *netdev_list; +struct netdev *netdev_list = RT_NULL; /* The default network interface device */ -struct netdev *netdev_default; +struct netdev *netdev_default = RT_NULL; /** * This function will register network interface device and @@ -46,8 +46,8 @@ struct netdev *netdev_default; int netdev_register(struct netdev *netdev, const char *name, void *user_data) { rt_base_t level; - uint16_t flags_mask; - int index; + rt_uint16_t flags_mask; + rt_uint16_t index; RT_ASSERT(netdev); RT_ASSERT(name); @@ -706,7 +706,7 @@ void netdev_low_level_set_gw(struct netdev *netdev, const ip_addr_t *gw) */ void netdev_low_level_set_dns_server(struct netdev *netdev, uint8_t dns_num, const ip_addr_t *dns_server) { - int index; + unsigned int index; RT_ASSERT(dns_server); @@ -1173,7 +1173,7 @@ MSH_CMD_EXPORT_ALIAS(netdev_ping, ping, ping network host); static void netdev_list_dns(void) { - int index = 0; + unsigned int index = 0; struct netdev *netdev = RT_NULL; rt_slist_t *node = RT_NULL; diff --git a/components/net/sal/src/sal_socket.c b/components/net/sal/src/sal_socket.c index 7e00ebf9bf..3256b9f4d6 100644 --- a/components/net/sal/src/sal_socket.c +++ b/components/net/sal/src/sal_socket.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2021, RT-Thread Development Team + * Copyright (c) 2006-2022, RT-Thread Development Team * * SPDX-License-Identifier: Apache-2.0 * @@ -158,7 +158,8 @@ static void check_netdev_internet_up_work(struct rt_work *work, void *work_data) #define SAL_INTERNET_MONTH_LEN 4 #define SAL_INTERNET_DATE_LEN 16 - int index, sockfd = -1, result = 0; + unsigned int index; + int sockfd = -1, result = 0; struct sockaddr_in server_addr; struct hostent *host; struct timeval timeout; @@ -168,7 +169,7 @@ static void check_netdev_internet_up_work(struct rt_work *work, void *work_data) const char month[][SAL_INTERNET_MONTH_LEN] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; char date[SAL_INTERNET_DATE_LEN]; - int moth_num = 0; + unsigned int moth_num = 0; struct sal_proto_family *pf = (struct sal_proto_family *) netdev->sal_user_data; const struct sal_socket_ops *skt_ops; diff --git a/libcpu/arm/common/showmem.c b/libcpu/arm/common/showmem.c index 25b18d7fcf..2ece137a40 100644 --- a/libcpu/arm/common/showmem.c +++ b/libcpu/arm/common/showmem.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2021, RT-Thread Development Team + * Copyright (c) 2006-2022, RT-Thread Development Team * * SPDX-License-Identifier: Apache-2.0 * @@ -12,7 +12,7 @@ void rt_hw_show_memory(rt_uint32_t addr, rt_uint32_t size) { - int i = 0, j = 0; + unsigned int i = 0, j = 0; RT_ASSERT(addr); diff --git a/src/kservice.c b/src/kservice.c index dfa0da9cd6..1704f9d600 100644 --- a/src/kservice.c +++ b/src/kservice.c @@ -287,7 +287,7 @@ RT_WEAK void *rt_memcpy(void *dst, const void *src, rt_ubase_t count) char *src_ptr = (char *)src; long *aligned_dst; long *aligned_src; - int len = count; + rt_ubase_t len = count; /* If the size is small, or either SRC or DST is unaligned, then punt into the byte copy loop. This should be rare. */ diff --git a/src/mem.c b/src/mem.c index 307391cac1..14593bcfd7 100644 --- a/src/mem.c +++ b/src/mem.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006-2021, RT-Thread Development Team + * Copyright (c) 2006-2022, RT-Thread Development Team * * SPDX-License-Identifier: Apache-2.0 * @@ -290,10 +290,14 @@ void *rt_smem_alloc(rt_smem_t m, rt_size_t size) RT_ASSERT(rt_object_is_systemobject(&m->parent)); if (size != RT_ALIGN(size, RT_ALIGN_SIZE)) + { RT_DEBUG_LOG(RT_DEBUG_MEM, ("malloc size %d, but align to %d\n", size, RT_ALIGN(size, RT_ALIGN_SIZE))); + } else + { RT_DEBUG_LOG(RT_DEBUG_MEM, ("malloc size %d\n", size)); + } small_mem = (struct rt_small_mem *)m; /* alignment size */ diff --git a/src/timer.c b/src/timer.c index 82caec8ecb..ce11bf3518 100644 --- a/src/timer.c +++ b/src/timer.c @@ -832,7 +832,7 @@ static void _timer_thread_entry(void *parameter) */ void rt_system_timer_init(void) { - int i; + rt_size_t i; for (i = 0; i < sizeof(_timer_list) / sizeof(_timer_list[0]); i++) {