From bca46ad234a92d4bd2819ef73bff8c1e128faf3f Mon Sep 17 00:00:00 2001 From: wdfk-prog <1425075683@qq.com> Date: Mon, 13 Oct 2025 13:20:30 +0800 Subject: [PATCH] =?UTF-8?q?fix[components]:=20=E4=BF=AE=E5=A4=8D=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E8=BE=93=E5=87=BA=E7=9A=84gcc=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E8=AD=A6=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/dfs/dfs_v1/src/dfs_fs.c | 6 +++--- components/drivers/spi/dev_spi_flash_sfud.c | 22 ++++++++++----------- components/finsh/msh_file.c | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/components/dfs/dfs_v1/src/dfs_fs.c b/components/dfs/dfs_v1/src/dfs_fs.c index 810690bee9b..c2fbe801100 100644 --- a/components/dfs/dfs_v1/src/dfs_fs.c +++ b/components/dfs/dfs_v1/src/dfs_fs.c @@ -183,7 +183,7 @@ int dfs_filesystem_get_partition(struct dfs_partition *part, part->offset = *(dpt + 8) | *(dpt + 9) << 8 | *(dpt + 10) << 16 | *(dpt + 11) << 24; part->size = *(dpt + 12) | *(dpt + 13) << 8 | *(dpt + 14) << 16 | *(dpt + 15) << 24; - rt_kprintf("found part[%d], begin: %d, size: ", + rt_kprintf("found part[%ld], begin: %ld, size: ", pindex, part->offset * 512); if ((part->size >> 11) == 0) rt_kprintf("%d%s", part->size >> 1, "KB\n"); /* KB */ @@ -636,7 +636,7 @@ int df(const char *path) if (rt_get_errno() == -ENOSYS) rt_kprintf("The function is not implemented.\n"); else - rt_kprintf("statfs failed: errno=%d.\n", rt_get_errno()); + rt_kprintf("statfs failed: errno=%ld.\n", rt_get_errno()); return -1; } @@ -649,7 +649,7 @@ int df(const char *path) cap = cap / 1024; } - rt_kprintf("disk free: %d.%d %s [ %d block, %d bytes per block ]\n", + rt_kprintf("disk free: %ld.%d %s [ %d block, %d bytes per block ]\n", (unsigned long)cap, minor, unit_str[unit_index], buffer.f_bfree, buffer.f_bsize); return 0; } diff --git a/components/drivers/spi/dev_spi_flash_sfud.c b/components/drivers/spi/dev_spi_flash_sfud.c index e7198f41a31..e24002e639c 100644 --- a/components/drivers/spi/dev_spi_flash_sfud.c +++ b/components/drivers/spi/dev_spi_flash_sfud.c @@ -569,9 +569,9 @@ static void sf(uint8_t argc, char **argv) { sfud_dev = (sfud_flash_t)rtt_dev->user_data; if (sfud_dev->chip.capacity < 1024 * 1024) { - rt_kprintf("%d KB %s is current selected device.\n", sfud_dev->chip.capacity / 1024, sfud_dev->name); + rt_kprintf("%ld KB %s is current selected device.\n", sfud_dev->chip.capacity / 1024, sfud_dev->name); } else { - rt_kprintf("%d MB %s is current selected device.\n", sfud_dev->chip.capacity / 1024 / 1024, + rt_kprintf("%ld MB %s is current selected device.\n", sfud_dev->chip.capacity / 1024 / 1024, sfud_dev->name); } } @@ -591,12 +591,12 @@ static void sf(uint8_t argc, char **argv) { if (data) { result = sfud_read(sfud_dev, addr, size, data); if (result == SFUD_SUCCESS) { - rt_kprintf("Read the %s flash data success. Start from 0x%08X, size is %ld. The data is:\n", + rt_kprintf("Read the %s flash data success. Start from 0x%08lX, size is %ld. The data is:\n", sfud_dev->name, addr, size); rt_kprintf("Offset (h) 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F\n"); for (i = 0; i < size; i += HEXDUMP_WIDTH) { - rt_kprintf("[%08X] ", addr + i); + rt_kprintf("[%08lX] ", addr + i); /* dump hex */ for (j = 0; j < HEXDUMP_WIDTH; j++) { if (i + j < size) { @@ -634,7 +634,7 @@ static void sf(uint8_t argc, char **argv) { } result = sfud_write(sfud_dev, addr, size, data); if (result == SFUD_SUCCESS) { - rt_kprintf("Write the %s flash data success. Start from 0x%08X, size is %ld.\n", + rt_kprintf("Write the %s flash data success. Start from 0x%08lX, size is %ld.\n", sfud_dev->name, addr, size); rt_kprintf("Write data: "); for (i = 0; i < size; i++) { @@ -656,7 +656,7 @@ static void sf(uint8_t argc, char **argv) { size = strtol(argv[3], NULL, 0); result = sfud_erase(sfud_dev, addr, size); if (result == SFUD_SUCCESS) { - rt_kprintf("Erase the %s flash data success. Start from 0x%08X, size is %ld.\n", sfud_dev->name, + rt_kprintf("Erase the %s flash data success. Start from 0x%08lX, size is %ld.\n", sfud_dev->name, addr, size); } } @@ -700,7 +700,7 @@ static void sf(uint8_t argc, char **argv) { result = sfud_erase(sfud_dev, addr, size); if (result == SFUD_SUCCESS) { time_cast = rt_tick_get() - start_time; - rt_kprintf("Erase benchmark success, total time: %d.%03dS.\n", time_cast / RT_TICK_PER_SECOND, + rt_kprintf("Erase benchmark success, total time: %ld.%03ldS.\n", time_cast / RT_TICK_PER_SECOND, time_cast % RT_TICK_PER_SECOND / ((RT_TICK_PER_SECOND * 1 + 999) / 1000)); } else { rt_kprintf("Erase benchmark has an error. Error code: %d.\n", result); @@ -716,13 +716,13 @@ static void sf(uint8_t argc, char **argv) { } result = sfud_write(sfud_dev, addr + i, cur_op_size, write_data); if (result != SFUD_SUCCESS) { - rt_kprintf("Writing %s failed, already wr for %lu bytes, write %d each time\n", sfud_dev->name, i, write_size); + rt_kprintf("Writing %s failed, already wr for %u bytes, write %d each time\n", sfud_dev->name, i, write_size); break; } } if (result == SFUD_SUCCESS) { time_cast = rt_tick_get() - start_time; - rt_kprintf("Write benchmark success, total time: %d.%03dS.\n", time_cast / RT_TICK_PER_SECOND, + rt_kprintf("Write benchmark success, total time: %ld.%03ldS.\n", time_cast / RT_TICK_PER_SECOND, time_cast % RT_TICK_PER_SECOND / ((RT_TICK_PER_SECOND * 1 + 999) / 1000)); } else { rt_kprintf("Write benchmark has an error. Error code: %d.\n", result); @@ -745,13 +745,13 @@ static void sf(uint8_t argc, char **argv) { } if (result != SFUD_SUCCESS) { - rt_kprintf("Read %s failed, already rd for %lu bytes, read %d each time\n", sfud_dev->name, i, read_size); + rt_kprintf("Read %s failed, already rd for %u bytes, read %d each time\n", sfud_dev->name, i, read_size); break; } } if (result == SFUD_SUCCESS) { time_cast = rt_tick_get() - start_time; - rt_kprintf("Read benchmark success, total time: %d.%03dS.\n", time_cast / RT_TICK_PER_SECOND, + rt_kprintf("Read benchmark success, total time: %ld.%03ldS.\n", time_cast / RT_TICK_PER_SECOND, time_cast % RT_TICK_PER_SECOND / ((RT_TICK_PER_SECOND * 1 + 999) / 1000)); } else { rt_kprintf("Read benchmark has an error. Error code: %d.\n", result); diff --git a/components/finsh/msh_file.c b/components/finsh/msh_file.c index 07e22a82066..3ef4c8f9217 100644 --- a/components/finsh/msh_file.c +++ b/components/finsh/msh_file.c @@ -796,7 +796,7 @@ static int cmd_tail(int argc, char **argv) } } - rt_kprintf("\nTotal Number of lines:%d\n", total_lines); + rt_kprintf("\nTotal Number of lines:%ld\n", total_lines); if (start_line != 0) { @@ -818,7 +818,7 @@ static int cmd_tail(int argc, char **argv) close(fd); return -1; } - rt_kprintf("Required Number of lines:%d\n", required_lines); + rt_kprintf("Required Number of lines:%ld\n", required_lines); target_line = total_lines - required_lines; lseek(fd, 0, SEEK_SET); /* back to head */