Skip to content
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

Jump to bottom

Fix #932 and #1089, strncpy cleanup and UT updates for mission sizing of API_LEN and PATH_LEN #1098

Merged
merged 3 commits into from
Jan 25, 2021
Merged

Fix #932 and #1089, strncpy cleanup and UT updates for mission sizing of API_LEN and PATH_LEN #1098

merged 3 commits into from
Jan 25, 2021

Conversation

skliper
Copy link
Contributor

@skliper skliper commented Jan 14, 2021 •
edited
Loading

Describe the contribution
Fix #1089 - this cleans up the use of strncpy (and other minor hardcoded references) which solves most of #932
Fix #932 - remainder of cleanup in unit tests now that CFE_MISSION_MAX_API_LEN and CFE_MISSION_MAX_PATH_LEN can be bigger than OS_MAX_API_NAME and OS_MAX_PATH_LENGTH

Other minor mods

  • Moved ES pipe name, lengths to defines (someday these could be cfg items, but just matched pattern of other services for now)
  • Removed PipeName and PipeDepth variables from app global where they didn't add anything (just sent and passed)
  • Removed many unnecessary (char *) casts
  • Simplified &stingname[0] to stringname where observed

Testing performed
Built and ran unit tests with sample config (where values are equal), and with CFE_MISSION* += 4, passed

Expected behavior changes
None, just easier maintenance and allows for use case of mission with multiple OS's w/ different limits to have standard cmd/tlm and the unit tests will still pass

System(s) tested on

  • Hardware: cFS Dev Server
  • OS: Ubuntu 18.04
  • Versions: Bundle main + this commit

Additional context
None

Third party code
None

Contributor Info - All information REQUIRED for consideration of pull request
Jacob Hageman - NASA/GSFC

@skliper skliper added the CCB:Ready Ready for discussion at the Configuration Control Board (CCB) label Jan 14, 2021
@astrogeco
Copy link
Contributor

CCB:2021-01-21 APPROVED

@astrogeco astrogeco changed the base branch from main to integration-candidate January 25, 2021 03:37
@astrogeco astrogeco added CCB:2021-01-21 conflicts and removed CCB:Ready Ready for discussion at the Configuration Control Board (CCB) labels Jan 25, 2021
@astrogeco
Copy link
Contributor

@skliper can you check the conflicts here?

astrogeco added a commit to astrogeco/cFE that referenced this pull request Jan 25, 2021
@astrogeco
Merge pull request nasa#1098 from skliper/fix1089-clean_strncpy
632153a 
Fix nasa#1089, Cleanup strncpy use - unit tests
Fix nasa#1089, Cleanup strncpy use - main code

Fix nasa#932, Update UT for CFE_MISSION* string sizing
astrogeco added a commit to astrogeco/cFS that referenced this pull request Jan 25, 2021
@astrogeco
Add nasa/cFE#1098
970fbad
@skliper skliper force-pushed the fix1089-clean_strncpy branch from 170aac8 to 26a0e06 Compare January 25, 2021 19:26
@skliper
Copy link
Contributor Author

skliper commented Jan 25, 2021

@astrogeco - fixed.

@astrogeco astrogeco merged commit a4aa481 into nasa:integration-candidate Jan 25, 2021
astrogeco added a commit to nasa/cFS that referenced this pull request Jan 25, 2021
@astrogeco
Add nasa/cFE#1098
c79ffe9
@astrogeco astrogeco mentioned this pull request Jan 25, 2021
Merged
@skliper skliper deleted the fix1089-clean_strncpy branch February 1, 2021 22:04
@skliper skliper added this to the 7.0.0 milestone Sep 24, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
Caelum
Development

Successfully merging this pull request may close these issues.

Clean up strncpy use Unit tests should use cFE defines instead of OS_MAX_PATH_LEN and OS_MAX_API_NAME
2 participants
@skliper @astrogeco