Skip to content

Fix #2446, clarify startup token count message #2792

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sylvesterkaczmarek wants to merge 1 commit into
base: dev
Choose a base branch
from
+4 −1
Open

Fix #2446, clarify startup token count message #2792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion modules/es/fsw/src/cfe_es_startupscript.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,9 @@ int32 CFE_ES_ParseFileEntry(const char **TokenList, uint32 NumTokens)
*/
if (NumTokens < 8)
{
CFE_ES_WriteToSysLog("%s: Invalid ES Startup file entry: %u\n", __func__, (unsigned int)NumTokens);
CFE_ES_WriteToSysLog("%s: Invalid ES Startup file entry: NumTokens = %u, expected at least 8\n",
__func__,
(unsigned int)NumTokens);
return CFE_ES_BAD_ARGUMENT;
}

Expand Down
1 change: 1 addition & 0 deletions modules/es/ut-coverage/es_UT.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -659,6 +659,7 @@ void TestApps(void)
/* Test parsing the startup script with an invalid argument passed in */
ES_ResetUnitTest();
UtAssert_INT32_EQ(CFE_ES_ParseFileEntry(NULL, 0), CFE_ES_BAD_ARGUMENT);
CFE_UtAssert_PRINTF("NumTokens = 0, expected at least 8");

/* Test application loading and creation with a task creation failure */
ES_ResetUnitTest();
Expand Down