mirror of
				https://github.com/eledio-devices/thirdparty-littlefs.git
				synced 2025-10-31 08:42:40 +01:00 
			
		
		
		
	don't use lfs_file_open() when LFS_NO_MALLOC is set
This commit is contained in:
		
							
								
								
									
										2
									
								
								lfs.c
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								lfs.c
									
									
									
									
									
								
							| @@ -5082,6 +5082,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) { | ||||||
| @@ -5097,6 +5098,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, | ||||||
|   | |||||||
							
								
								
									
										5
									
								
								lfs.h
									
									
									
									
									
								
							
							
						
						
									
										5
									
								
								lfs.h
									
									
									
									
									
								
							| @@ -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 | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user