Skip to content

Commit bca46ad

Browse files
committed
fix[components]: 修复日志输出的gcc编译警告
1 parent 7499790 commit bca46ad

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

components/dfs/dfs_v1/src/dfs_fs.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ int dfs_filesystem_get_partition(struct dfs_partition *part,
183183
part->offset = *(dpt + 8) | *(dpt + 9) << 8 | *(dpt + 10) << 16 | *(dpt + 11) << 24;
184184
part->size = *(dpt + 12) | *(dpt + 13) << 8 | *(dpt + 14) << 16 | *(dpt + 15) << 24;
185185

186-
rt_kprintf("found part[%d], begin: %d, size: ",
186+
rt_kprintf("found part[%ld], begin: %ld, size: ",
187187
pindex, part->offset * 512);
188188
if ((part->size >> 11) == 0)
189189
rt_kprintf("%d%s", part->size >> 1, "KB\n"); /* KB */
@@ -636,7 +636,7 @@ int df(const char *path)
636636
if (rt_get_errno() == -ENOSYS)
637637
rt_kprintf("The function is not implemented.\n");
638638
else
639-
rt_kprintf("statfs failed: errno=%d.\n", rt_get_errno());
639+
rt_kprintf("statfs failed: errno=%ld.\n", rt_get_errno());
640640
return -1;
641641
}
642642

@@ -649,7 +649,7 @@ int df(const char *path)
649649
cap = cap / 1024;
650650
}
651651

652-
rt_kprintf("disk free: %d.%d %s [ %d block, %d bytes per block ]\n",
652+
rt_kprintf("disk free: %ld.%d %s [ %d block, %d bytes per block ]\n",
653653
(unsigned long)cap, minor, unit_str[unit_index], buffer.f_bfree, buffer.f_bsize);
654654
return 0;
655655
}

components/drivers/spi/dev_spi_flash_sfud.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -569,9 +569,9 @@ static void sf(uint8_t argc, char **argv) {
569569

570570
sfud_dev = (sfud_flash_t)rtt_dev->user_data;
571571
if (sfud_dev->chip.capacity < 1024 * 1024) {
572-
rt_kprintf("%d KB %s is current selected device.\n", sfud_dev->chip.capacity / 1024, sfud_dev->name);
572+
rt_kprintf("%ld KB %s is current selected device.\n", sfud_dev->chip.capacity / 1024, sfud_dev->name);
573573
} else {
574-
rt_kprintf("%d MB %s is current selected device.\n", sfud_dev->chip.capacity / 1024 / 1024,
574+
rt_kprintf("%ld MB %s is current selected device.\n", sfud_dev->chip.capacity / 1024 / 1024,
575575
sfud_dev->name);
576576
}
577577
}
@@ -591,12 +591,12 @@ static void sf(uint8_t argc, char **argv) {
591591
if (data) {
592592
result = sfud_read(sfud_dev, addr, size, data);
593593
if (result == SFUD_SUCCESS) {
594-
rt_kprintf("Read the %s flash data success. Start from 0x%08X, size is %ld. The data is:\n",
594+
rt_kprintf("Read the %s flash data success. Start from 0x%08lX, size is %ld. The data is:\n",
595595
sfud_dev->name, addr, size);
596596
rt_kprintf("Offset (h) 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F\n");
597597
for (i = 0; i < size; i += HEXDUMP_WIDTH)
598598
{
599-
rt_kprintf("[%08X] ", addr + i);
599+
rt_kprintf("[%08lX] ", addr + i);
600600
/* dump hex */
601601
for (j = 0; j < HEXDUMP_WIDTH; j++) {
602602
if (i + j < size) {
@@ -634,7 +634,7 @@ static void sf(uint8_t argc, char **argv) {
634634
}
635635
result = sfud_write(sfud_dev, addr, size, data);
636636
if (result == SFUD_SUCCESS) {
637-
rt_kprintf("Write the %s flash data success. Start from 0x%08X, size is %ld.\n",
637+
rt_kprintf("Write the %s flash data success. Start from 0x%08lX, size is %ld.\n",
638638
sfud_dev->name, addr, size);
639639
rt_kprintf("Write data: ");
640640
for (i = 0; i < size; i++) {
@@ -656,7 +656,7 @@ static void sf(uint8_t argc, char **argv) {
656656
size = strtol(argv[3], NULL, 0);
657657
result = sfud_erase(sfud_dev, addr, size);
658658
if (result == SFUD_SUCCESS) {
659-
rt_kprintf("Erase the %s flash data success. Start from 0x%08X, size is %ld.\n", sfud_dev->name,
659+
rt_kprintf("Erase the %s flash data success. Start from 0x%08lX, size is %ld.\n", sfud_dev->name,
660660
addr, size);
661661
}
662662
}
@@ -700,7 +700,7 @@ static void sf(uint8_t argc, char **argv) {
700700
result = sfud_erase(sfud_dev, addr, size);
701701
if (result == SFUD_SUCCESS) {
702702
time_cast = rt_tick_get() - start_time;
703-
rt_kprintf("Erase benchmark success, total time: %d.%03dS.\n", time_cast / RT_TICK_PER_SECOND,
703+
rt_kprintf("Erase benchmark success, total time: %ld.%03ldS.\n", time_cast / RT_TICK_PER_SECOND,
704704
time_cast % RT_TICK_PER_SECOND / ((RT_TICK_PER_SECOND * 1 + 999) / 1000));
705705
} else {
706706
rt_kprintf("Erase benchmark has an error. Error code: %d.\n", result);
@@ -716,13 +716,13 @@ static void sf(uint8_t argc, char **argv) {
716716
}
717717
result = sfud_write(sfud_dev, addr + i, cur_op_size, write_data);
718718
if (result != SFUD_SUCCESS) {
719-
rt_kprintf("Writing %s failed, already wr for %lu bytes, write %d each time\n", sfud_dev->name, i, write_size);
719+
rt_kprintf("Writing %s failed, already wr for %u bytes, write %d each time\n", sfud_dev->name, i, write_size);
720720
break;
721721
}
722722
}
723723
if (result == SFUD_SUCCESS) {
724724
time_cast = rt_tick_get() - start_time;
725-
rt_kprintf("Write benchmark success, total time: %d.%03dS.\n", time_cast / RT_TICK_PER_SECOND,
725+
rt_kprintf("Write benchmark success, total time: %ld.%03ldS.\n", time_cast / RT_TICK_PER_SECOND,
726726
time_cast % RT_TICK_PER_SECOND / ((RT_TICK_PER_SECOND * 1 + 999) / 1000));
727727
} else {
728728
rt_kprintf("Write benchmark has an error. Error code: %d.\n", result);
@@ -745,13 +745,13 @@ static void sf(uint8_t argc, char **argv) {
745745
}
746746

747747
if (result != SFUD_SUCCESS) {
748-
rt_kprintf("Read %s failed, already rd for %lu bytes, read %d each time\n", sfud_dev->name, i, read_size);
748+
rt_kprintf("Read %s failed, already rd for %u bytes, read %d each time\n", sfud_dev->name, i, read_size);
749749
break;
750750
}
751751
}
752752
if (result == SFUD_SUCCESS) {
753753
time_cast = rt_tick_get() - start_time;
754-
rt_kprintf("Read benchmark success, total time: %d.%03dS.\n", time_cast / RT_TICK_PER_SECOND,
754+
rt_kprintf("Read benchmark success, total time: %ld.%03ldS.\n", time_cast / RT_TICK_PER_SECOND,
755755
time_cast % RT_TICK_PER_SECOND / ((RT_TICK_PER_SECOND * 1 + 999) / 1000));
756756
} else {
757757
rt_kprintf("Read benchmark has an error. Error code: %d.\n", result);

components/finsh/msh_file.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -796,7 +796,7 @@ static int cmd_tail(int argc, char **argv)
796796
}
797797
}
798798

799-
rt_kprintf("\nTotal Number of lines:%d\n", total_lines);
799+
rt_kprintf("\nTotal Number of lines:%ld\n", total_lines);
800800

801801
if (start_line != 0)
802802
{
@@ -818,7 +818,7 @@ static int cmd_tail(int argc, char **argv)
818818
close(fd);
819819
return -1;
820820
}
821-
rt_kprintf("Required Number of lines:%d\n", required_lines);
821+
rt_kprintf("Required Number of lines:%ld\n", required_lines);
822822

823823
target_line = total_lines - required_lines;
824824
lseek(fd, 0, SEEK_SET); /* back to head */

0 commit comments

Comments
 (0)