Github/littlefs
1
Fork 0
Code Actions Activity

Merge pull request #614 from nnayo/fix_no_malloc_2

Browse Source 
don't use lfs_file_open() when LFS_NO_MALLOC is set
This commit is contained in:
Christopher Haster
2022-04-10 14:44:33 -05:00
committed by GitHub
parent f40b854ab5 e334983767
commit bfb9bd2483
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lfs.c
+2
View File
@@ -5104,6 +5104,7 @@ int lfs_removeattr(lfs_t *lfs, const char *path, uint8_t type) {
} }
#endif #endif
#ifndef LFS_NO_MALLOC
int lfs_file_open(lfs_t *lfs, lfs_file_t *file, const char *path, int flags) { int lfs_file_open(lfs_t *lfs, lfs_file_t *file, const char *path, int flags) {
int err = LFS_LOCK(lfs->cfg); int err = LFS_LOCK(lfs->cfg);
if (err) { if (err) {
@@ -5119,6 +5120,7 @@ int lfs_file_open(lfs_t *lfs, lfs_file_t *file, const char *path, int flags) {
LFS_UNLOCK(lfs->cfg); LFS_UNLOCK(lfs->cfg);
return err; return err;
} }
#endif
int lfs_file_opencfg(lfs_t *lfs, lfs_file_t *file, int lfs_file_opencfg(lfs_t *lfs, lfs_file_t *file,
const char *path, int flags, const char *path, int flags,
lfs.h
+5
View File
@@ -513,6 +513,7 @@ int lfs_removeattr(lfs_t *lfs, const char *path, uint8_t type);
/// File operations /// /// File operations ///
#ifndef LFS_NO_MALLOC
// Open a file // Open a file
// //
// The mode that the file is opened in is determined by the flags, which // The mode that the file is opened in is determined by the flags, which
@@ -522,6 +523,10 @@ int lfs_removeattr(lfs_t *lfs, const char *path, uint8_t type);
int lfs_file_open(lfs_t *lfs, lfs_file_t *file, int lfs_file_open(lfs_t *lfs, lfs_file_t *file,
const char *path, int flags); const char *path, int flags);
// if LFS_NO_MALLOC is defined, lfs_file_open() will fail with LFS_ERR_NOMEM
// thus use lfs_file_opencfg() with config.buffer set.
#endif
// Open a file with extra configuration // Open a file with extra configuration
// //
// The mode that the file is opened in is determined by the flags, which // The mode that the file is opened in is determined by the flags, which