Fix #285, flatten logic in CF_CFDP_InitEngine() to fix bug #286
Conversation
havencarlson
changed the title
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| CF_AppData.config_table->chan[i].pipe_depth_input); | ||
| if (ret != CFE_SUCCESS) | ||
| { | ||
| CFE_EVS_SendEvent(CF_EID_ERR_INIT_SUB, CFE_EVS_EventType_ERROR, |
Check warning
Code scanning / CodeQL-coding-standard
Unchecked return value
| CFE_EVS_SendEvent(CF_EID_ERR_INIT_SUB, CFE_EVS_EventType_ERROR, | ||
| "CF: failed to subscribe to MID 0x%lx, returned 0x%08lx", | ||
| (unsigned long)CF_AppData.config_table->chan[i].mid_input, (unsigned long)ret); | ||
| CFE_EVS_SendEvent(CF_EID_ERR_INIT_SEM, CFE_EVS_EventType_ERROR, |
Check warning
Code scanning / CodeQL-coding-standard
Unchecked return value
| } | ||
| for (j = 0; j < CF_NUM_TRANSACTIONS_PER_CHANNEL; ++j, ++t) | ||
| { | ||
| int k; |
Check notice
Code scanning / CodeQL-coding-standard
Use of basic integral type
| t->chan_num = i; | ||
| CF_FreeTransaction(t); | ||
|
|
||
| for (k = 0; k < CF_Direction_NUM; ++k, ++c) |
Check notice
Code scanning / CodeQL-coding-standard
AV Rule 168
| CF_CList_InsertBack_Ex(&CF_AppData.engine.channels[i], CF_QueueIdx_HIST_FREE, &h->cl_node); | ||
| } | ||
| } | ||
| for (j = 0; j < CF_NUM_TRANSACTIONS_PER_CHANNEL; ++j, ++t) |
Check notice
Code scanning / CodeQL-coding-standard
AV Rule 168
havencarlson
force-pushed
the
fix#285-goto
branch
from
21e6643
to
e2763f5
Compare
…kipped needed code
havencarlson
force-pushed
the
fix#285-goto
branch
from
e2763f5
to
22e2855
Compare
|
21 July 2022: Merging as a hotfix, will review in next CCB (7/27). |
|
@dzbaker - did we ever discuss this one in a CCB? If not we should include so we can add the approved label. |
dzbaker
added
CCB:Ready
Checklist (Please check before submitting)
Describe the contribution
Fix #285, fixed error in code where semaphore name being blank would skip to the end of
CF_CFDP_InitEngine()Testing performed
Ran unit tests
Expected behavior changes
If the semaphore name is blank, continue with function instead of exiting.
System(s) tested on
Contributor Info - All information REQUIRED for consideration of pull request
Haven Carlson - NASA