highperfocused/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2025-10-11 07:32:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into xfw-dev

Browse Source
This commit is contained in:
Willy-JL
2023-11-16 02:19:28 +00:00
parent 8096391c6c 4b3e8aba29
commit a4d01d5d88
135 changed files with 3318 additions and 1252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/toolbox/saved_struct.c
View File

@@ -46,7 +46,7 @@ bool saved_struct_save(const char* path, void* data, size_t size, uint8_t magic,
header.flags = 0;
header.timestamp = 0;
uint16_t bytes_count = storage_file_write(file, &header, sizeof(header));
size_t bytes_count = storage_file_write(file, &header, sizeof(header));
bytes_count += storage_file_write(file, data, size);
if(bytes_count != (size + sizeof(header))) {
@@ -83,7 +83,7 @@ bool saved_struct_load(const char* path, void* data, size_t size, uint8_t magic,
uint64_t bytes_file = storage_file_size(file);
result = bytes_file == bytes_expected;
if(result) {
uint16_t bytes_count = storage_file_read(file, &header, sizeof(SavedStructHeader));
size_t bytes_count = storage_file_read(file, &header, sizeof(SavedStructHeader));
bytes_count += storage_file_read(file, data_read, size);
result = bytes_count == bytes_expected;
}
@@ -151,7 +151,7 @@ bool saved_struct_get_payload_size(
break;
}
uint16_t bytes_count = storage_file_read(file, &header, sizeof(SavedStructHeader));
size_t bytes_count = storage_file_read(file, &header, sizeof(SavedStructHeader));
if(bytes_count != sizeof(SavedStructHeader)) {
FURI_LOG_E(TAG, "Failed to read header");
break;