nikon/CANopenNode
1
0
Fork 0
Code Activity Actions

CO_ODinterface: fix unreachable statement (#548)

Browse source 
Using a `break` after a `return` triggers warning 111 of Arm Compiler 5. To fix this warning while respecting MISRA rules, the return mechanism of OD_getSub() function was changed to only exit at the end.
This commit is contained in:
Vincent Chatelain 2024-10-19 00:51:48 +02:00 committed by GitHub
parent 29c5b64131
commit 9e9aaf5f8d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 29 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
301/CO_ODinterface.c
View file

@ -182,13 +182,15 @@ OD_getSub(const OD_entry_t* entry, uint8_t subIndex, OD_IO_t* io, bool_t odOrig)
return ODR_DEV_INCOMPAT;
}
ODR_t ret = ODR_OK;
OD_stream_t* stream = &io->stream;
/* attribute, dataOrig and dataLength, depends on object type */
switch (entry->odObjectType & (uint8_t)ODT_TYPE_MASK) {
case ODT_VAR: {
if (subIndex > 0U) {
return ODR_SUB_NOT_EXIST;
ret = ODR_SUB_NOT_EXIST;
break;
}
CO_PROGMEM OD_obj_var_t* odo = entry->odObject;
@ -199,7 +201,8 @@ OD_getSub(const OD_entry_t* entry, uint8_t subIndex, OD_IO_t* io, bool_t odOrig)
}
case ODT_ARR: {
if (subIndex >= entry->subEntriesCount) {
return ODR_SUB_NOT_EXIST;
ret = ODR_SUB_NOT_EXIST;
break;
}
CO_PROGMEM OD_obj_array_t* odo = entry->odObject;
@ -225,7 +228,8 @@ OD_getSub(const OD_entry_t* entry, uint8_t subIndex, OD_IO_t* io, bool_t odOrig)
}
}
if (odo == NULL) {
return ODR_SUB_NOT_EXIST;
ret = ODR_SUB_NOT_EXIST;
break;
}
stream->attribute = odo->attribute;
@ -234,32 +238,34 @@ OD_getSub(const OD_entry_t* entry, uint8_t subIndex, OD_IO_t* io, bool_t odOrig)
break;
}
default: {
return ODR_DEV_INCOMPAT;
ret = ODR_DEV_INCOMPAT;
break;
}
}
/* Access data from the original OD location */
if ((entry->extension == NULL) || odOrig) {
io->read = OD_readOriginal;
io->write = OD_writeOriginal;
stream->object = NULL;
}
/* Access data from extension specified by application */
else {
io->read = (entry->extension->read != NULL) ? entry->extension->read : OD_readDisabled;
io->write = (entry->extension->write != NULL) ? entry->extension->write : OD_writeDisabled;
stream->object = entry->extension->object;
if (ret == ODR_OK) {
/* Access data from the original OD location */
if ((entry->extension == NULL) || odOrig) {
io->read = OD_readOriginal;
io->write = OD_writeOriginal;
stream->object = NULL;
}
/* Access data from extension specified by application */
else {
io->read = (entry->extension->read != NULL) ? entry->extension->read : OD_readDisabled;
io->write = (entry->extension->write != NULL) ? entry->extension->write : OD_writeDisabled;
stream->object = entry->extension->object;
}
/* Reset stream data offset */
stream->dataOffset = 0;
/* Add informative data */
stream->index = entry->index;
stream->subIndex = subIndex;
}
/* Reset stream data offset */
stream->dataOffset = 0;
/* Add informative data */
stream->index = entry->index;
stream->subIndex = subIndex;
return ODR_OK;
return ret;
}
uint32_t