fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-07-02 01:50:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

dataman: make _file_write more readable

Browse Source 
This should not be any functional change. The only difference are the
variable scopes, and early return versus nested ifs.
This commit is contained in:
Julian Oes
2019-04-24 10:58:53 +02:00
committed by Daniel Agar
parent dc3341db59
commit bf32ff32f8
1 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/dataman/dataman.cpp
+9 -14
View File
@@ -495,11 +495,9 @@ static ssize_t
_file_write(dm_item_t item, unsigned index, dm_persitence_t persistence, const void *buf, size_t count)
{
unsigned char buffer[g_per_item_size[item]];
size_t len;
int offset;
/* Get the offset for this item */
offset = calculate_offset(item, index);
const int offset = calculate_offset(item, index);
/* If item type or index out of range, return error */
if (offset < 0) {
@@ -523,20 +521,17 @@ _file_write(dm_item_t item, unsigned index, dm_persitence_t persistence, const v
count += DM_SECTOR_HDR_SIZE;
len = -1;
/* Seek to the right spot in the data manager file and write the data item */
if (lseek(dm_operations_data.file.fd, offset, SEEK_SET) == offset) {
if ((len = write(dm_operations_data.file.fd, buffer, count)) == count) {
fsync(dm_operations_data.file.fd); /* Make sure data is written to physical media */
}
}
/* Make sure the write succeeded */
if (len != count) {
if (lseek(dm_operations_data.file.fd, offset, SEEK_SET) != offset) {
return -1;
}
if ((write(dm_operations_data.file.fd, buffer, count)) != (ssize_t)count) {
return -1;
}
/* Make sure data is written to physical media */
fsync(dm_operations_data.file.fd);
/* All is well... return the number of user data written */
return count - DM_SECTOR_HDR_SIZE;
}