Skip to content

Commit 8fdaa75

Browse files
author
Vincent Dupont
committed
squash spiffs: fix printf format
1 parent ed47c75 commit 8fdaa75

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

pkg/spiffs/fs/spiffs_fs.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
* directory for more details.
77
*/
88

9-
#include <stdint.h>
109
#include <fcntl.h>
1110
#include <errno.h>
11+
#include <inttypes.h>
1212

1313
#include "fs/spiffs_fs.h"
1414

@@ -24,7 +24,7 @@ static int32_t _dev_read(struct spiffs_t *fs, u32_t addr, u32_t size, u8_t *dst)
2424
{
2525
mtd_dev_t *dev = (mtd_dev_t *)fs->user_data;
2626

27-
//DEBUG("spiffs: read: from addr 0x%x size 0x%x\n", addr, size);
27+
//DEBUG("spiffs: read: from addr 0x%" PRIx32 " size 0x%" PRIx32 "\n", addr, size);
2828

2929
return dev->driver->read(dev, dst, addr, size);
3030
}
@@ -33,7 +33,7 @@ static int32_t _dev_write(struct spiffs_t *fs, u32_t addr, u32_t size, u8_t *src
3333
{
3434
mtd_dev_t *dev = (mtd_dev_t *)fs->user_data;
3535

36-
DEBUG("spiffs: write: from addr 0x%x size 0x%x\n", addr, size);
36+
DEBUG("spiffs: write: from addr 0x%" PRIx32 " size 0x%" PRIx32 "\n", addr, size);
3737

3838
return dev->driver->write(dev, src, addr, size);
3939
}
@@ -42,7 +42,7 @@ static int32_t _dev_erase(struct spiffs_t *fs, u32_t addr, u32_t size)
4242
{
4343
mtd_dev_t *dev = (mtd_dev_t *)fs->user_data;
4444

45-
DEBUG("spiffs: erase: from addr 0x%x size 0x%x\n", addr, size);
45+
DEBUG("spiffs: erase: from addr 0x%" PRIx32" size 0x%" PRIx32 "\n", addr, size);
4646

4747
return dev->driver->erase(dev, addr, size);
4848
}
@@ -96,12 +96,12 @@ static int _mount(vfs_mount_t *mountp)
9696
NULL);
9797

9898
if (ret != 0) {
99-
DEBUG("spiffs: mount: ret %d\n", ret);
99+
DEBUG("spiffs: mount: ret %" PRId32 "\n", ret);
100100
switch (ret) {
101101
case SPIFFS_ERR_NOT_A_FS:
102102
DEBUG("spiffs: mount: formatting fs\n");
103103
ret = SPIFFS_format(&fs_desc->fs);
104-
DEBUG("spiffs: mount: format ret %d\n", ret);
104+
DEBUG("spiffs: mount: format ret %" PRId32 "\n", ret);
105105
if (ret < 0) {
106106
return spiffs_err_to_errno(ret);
107107
}
@@ -113,7 +113,7 @@ static int _mount(vfs_mount_t *mountp)
113113
fs_desc->cache,
114114
SPIFFS_FS_CACHE_SIZE,
115115
NULL);
116-
DEBUG("spiffs: mount: ret %d\n", ret);
116+
DEBUG("spiffs: mount: ret %" PRId32 "\n", ret);
117117
break;
118118
}
119119
}
@@ -175,7 +175,7 @@ static int _open(vfs_file_t *filp, const char *name, int flags, mode_t mode, con
175175
s_flags |= SPIFFS_O_EXCL;
176176
}
177177

178-
DEBUG("spiffs: open: %s (abs_path: %s), flags: 0x%x, mode: %d\n", name, abs_path, s_flags, mode);
178+
DEBUG("spiffs: open: %s (abs_path: %s), flags: 0x%x, mode: %d\n", name, abs_path, (int) s_flags, (int) mode);
179179

180180
s32_t ret = SPIFFS_open(&fs_desc->fs, name, s_flags, mode);
181181
if (ret >= 0) {
@@ -277,7 +277,7 @@ static int _readdir(vfs_DIR *dirp, vfs_dirent_t *entry)
277277
if (ret == NULL) {
278278
s32_t err = SPIFFS_errno(d->fs);
279279
if (err != SPIFFS_OK && err > SPIFFS_ERR_INTERNAL) {
280-
DEBUG("spiffs: readdir: err=%d\n", err);
280+
DEBUG("spiffs: readdir: err=%" PRId32 "\n", err);
281281
return -EIO;
282282
}
283283
}
@@ -305,7 +305,7 @@ static int spiffs_err_to_errno (s32_t err)
305305
return (int) err;
306306
}
307307

308-
DEBUG("spiffs: error=%d\n", err);
308+
DEBUG("spiffs: error=%" PRId32 "\n", err);
309309

310310
switch (err) {
311311
case SPIFFS_OK:

0 commit comments

Comments
 (0)