FlapJackApps/libdivecomputer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify the loop for reading the packet header

Browse Source 
The for loop construct without an increment statement is a bit unusual
and thus easy to miss. With an equivalent while loop, the intent becomes
a bit more obvious.
This commit is contained in:
Jef Driesen 2021-02-09 20:56:51 +01:00
parent d63c6cd04e
commit ecc23a5a76
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/uwatec_aladin.c
View File

@ -164,7 +164,8 @@ uwatec_aladin_device_dump (dc_device_t *abstract, dc_buffer_t *buffer)
unsigned char answer[SZ_MEMORY + 2] = {0}; unsigned char answer[SZ_MEMORY + 2] = {0};
// Receive the header of the package. // Receive the header of the package.
for (unsigned int i = 0; i < 4;) { unsigned int i = 0;
while (i < 4) {
if (device_is_cancelled (abstract)) if (device_is_cancelled (abstract))
return DC_STATUS_CANCELLED; return DC_STATUS_CANCELLED;
@ -173,11 +174,13 @@ uwatec_aladin_device_dump (dc_device_t *abstract, dc_buffer_t *buffer)
ERROR (abstract->context, "Failed to receive the answer."); ERROR (abstract->context, "Failed to receive the answer.");
return status; return status;
} }
if (answer[i] == (i < 3 ? 0x55 : 0x00)) {
i++; // Continue. const unsigned char expected = i < 3 ? 0x55 : 0x00;
} else { if (answer[i] != expected) {
i = 0; // Reset.
device_event_emit (abstract, DC_EVENT_WAITING, NULL); device_event_emit (abstract, DC_EVENT_WAITING, NULL);
i = 0;
} else {
i++;
} }
} }