Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-14 04:08:35 -07:00
Code Issues Packages Projects Releases Wiki Activity

Storage error handling improvements

Browse Source
This commit is contained in:
Willy-JL
2023-08-03 15:20:54 +02:00
parent 3e7724aeec
commit 21eeb53960
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
applications/services/storage/storages/storage_ext.c
View File

@@ -353,20 +353,20 @@ static uint16_t
static uint16_t static uint16_t
storage_ext_file_write(void* ctx, File* file, const void* buff, uint16_t const bytes_to_write) { storage_ext_file_write(void* ctx, File* file, const void* buff, uint16_t const bytes_to_write) {
uint16_t bytes_written = 0;
#ifdef FURI_RAM_EXEC #ifdef FURI_RAM_EXEC
UNUSED(ctx); UNUSED(ctx);
UNUSED(file); UNUSED(file);
UNUSED(buff); UNUSED(buff);
UNUSED(bytes_to_write); UNUSED(bytes_to_write);
return FSE_NOT_READY; file->error_id = FSE_NOT_READY;
#else #else
StorageData* storage = ctx; StorageData* storage = ctx;
SDFile* file_data = storage_get_storage_file_data(file, storage); SDFile* file_data = storage_get_storage_file_data(file, storage);
uint16_t bytes_written = 0;
file->internal_error_id = f_write(file_data, buff, bytes_to_write, &bytes_written); file->internal_error_id = f_write(file_data, buff, bytes_to_write, &bytes_written);
file->error_id = storage_ext_parse_error(file->internal_error_id); file->error_id = storage_ext_parse_error(file->internal_error_id);
return bytes_written;
#endif #endif
return bytes_written;
} }
static bool static bool
@@ -401,45 +401,45 @@ static bool storage_ext_file_expand(void* ctx, File* file, const uint64_t size)
UNUSED(ctx); UNUSED(ctx);
UNUSED(file); UNUSED(file);
UNUSED(size); UNUSED(size);
return FSE_NOT_READY; file->error_id = FSE_NOT_READY;
#else #else
StorageData* storage = ctx; StorageData* storage = ctx;
SDFile* file_data = storage_get_storage_file_data(file, storage); SDFile* file_data = storage_get_storage_file_data(file, storage);
file->internal_error_id = f_expand(file_data, size, 1); file->internal_error_id = f_expand(file_data, size, 1);
file->error_id = storage_ext_parse_error(file->internal_error_id); file->error_id = storage_ext_parse_error(file->internal_error_id);
return (file->error_id == FSE_OK);
#endif #endif
return (file->error_id == FSE_OK);
} }
static bool storage_ext_file_truncate(void* ctx, File* file) { static bool storage_ext_file_truncate(void* ctx, File* file) {
#ifdef FURI_RAM_EXEC #ifdef FURI_RAM_EXEC
UNUSED(ctx); UNUSED(ctx);
UNUSED(file); UNUSED(file);
return FSE_NOT_READY; file->error_id = FSE_NOT_READY;
#else #else
StorageData* storage = ctx; StorageData* storage = ctx;
SDFile* file_data = storage_get_storage_file_data(file, storage); SDFile* file_data = storage_get_storage_file_data(file, storage);
file->internal_error_id = f_truncate(file_data); file->internal_error_id = f_truncate(file_data);
file->error_id = storage_ext_parse_error(file->internal_error_id); file->error_id = storage_ext_parse_error(file->internal_error_id);
return (file->error_id == FSE_OK);
#endif #endif
return (file->error_id == FSE_OK);
} }
static bool storage_ext_file_sync(void* ctx, File* file) { static bool storage_ext_file_sync(void* ctx, File* file) {
#ifdef FURI_RAM_EXEC #ifdef FURI_RAM_EXEC
UNUSED(ctx); UNUSED(ctx);
UNUSED(file); UNUSED(file);
return FSE_NOT_READY; file->error_id = FSE_NOT_READY;
#else #else
StorageData* storage = ctx; StorageData* storage = ctx;
SDFile* file_data = storage_get_storage_file_data(file, storage); SDFile* file_data = storage_get_storage_file_data(file, storage);
file->internal_error_id = f_sync(file_data); file->internal_error_id = f_sync(file_data);
file->error_id = storage_ext_parse_error(file->internal_error_id); file->error_id = storage_ext_parse_error(file->internal_error_id);
return (file->error_id == FSE_OK);
#endif #endif
return (file->error_id == FSE_OK);
} }
static uint64_t storage_ext_file_size(void* ctx, File* file) { static uint64_t storage_ext_file_size(void* ctx, File* file) {

3
applications/services/storage/storages/storage_int.c
View File

@@ -459,7 +459,8 @@ static bool storage_int_file_expand(void* ctx, File* file, const uint64_t size)
UNUSED(ctx); UNUSED(ctx);
UNUSED(file); UNUSED(file);
UNUSED(size); UNUSED(size);
return false; file->error_id = FSE_NOT_IMPLEMENTED;
return (file->error_id == FSE_OK);
} }
static bool storage_int_file_truncate(void* ctx, File* file) { static bool storage_int_file_truncate(void* ctx, File* file) {