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.

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

Integration Candidate 20191115 #292

Merged
merged 5 commits into from
Nov 30, 2019
Merged

Integration Candidate 20191115 #292

merged 5 commits into from
Nov 30, 2019

Conversation

skliper
Copy link
Contributor

@skliper skliper commented Nov 19, 2019

Describe the contribution
Fixes #280, fixes #286, fixes #287

Testing performed
Steps taken to test the contribution:

  1. Checked out bundle with ic-20191115 branches
  2. make ENABLE_UNIT_TESTS=TRUE SIMULATION=native prep
  3. make
  4. make install
  5. make test
    Built without warnings, all tests passed except osal_timer_UT (nominal result on linux)
    executed cfe, successful startup with no warnings

Confirmed passed CI (with cppcheck enforced!)

Expected behavior changes
No functional changes, all doxygen/cppcheck warning/error cleanup

System(s) tested on:

  • cFS dev server
  • OS: Ubuntu 16.04
  • Versions: bundle ic-20191115 branch

Additional context
None

Contributor Info
Jacob Hageman - NASA/GSFC

avan989 and others added 5 commits November 15, 2019 14:25
Fixes #286, fixes #280
Code reviewed and approved at 20191106 CCB
Replace use of (1<<31) and (INT_MAX) with (UINT32_MAX/2) which should
squelch the cppcheck warnings about the left shift as well as being
more correct (the values in question are uint32's, not int's).

Also address two false positives about a return value being unassigned,
by simply initializing the value to be 0.
Fixes #287: cppcheck warnings
Copy link
Contributor

@jphickey jphickey left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sanity-checked as part of CFS bundle on Ubuntu 18.04 64-bit and Raspberry Pi (Raspbian 32-bit). Confirmed successful build and execution of CFE.

@skliper skliper merged commit 0f10e0e into master Nov 30, 2019
@skliper skliper deleted the ic-20191115 branch November 30, 2019 19:37
@skliper skliper added this to the 5.1.0 milestone Jun 1, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

cppcheck coverage check warning cppcheck unit test warning doxygen misc. warning
3 participants