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 #868, Use quotes for local includes #892

Merged
merged 1 commit into from
Mar 17, 2021
Merged

Fix #868, Use quotes for local includes #892

merged 1 commit into from
Mar 17, 2021

Conversation

skliper
Copy link
Contributor

@skliper skliper commented Mar 11, 2021

Describe the contribution
Fix #868 - scripted replacement for #include <os and #include <OSC_ matches of < and > with "

Testing performed
Build and execute unit tests

Expected behavior changes
None, just coding standard

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 this to the 6.0.0 milestone Mar 11, 2021
@skliper skliper requested a review from zanzaben March 11, 2021 18:48
@zanzaben
Copy link
Contributor

Missing Some utassert, uttest and utstubs

Here is one I found

osal/src/unit-test-coverage/shared/src/os-shared-coveragetest.h

Lines 31 to 33 in ead5723

#include <utassert.h>
#include <uttest.h>
#include <utstubs.h>

zanzaben
zanzaben suggested changes Mar 12, 2021
View reviewed changes
Copy link
Contributor

@zanzaben zanzaben left a comment

Choose a reason for hiding this comment

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

See my comment about missing UT

@skliper
Copy link
Contributor Author

skliper commented Mar 12, 2021

@zanzaben fixed, please confirm

@astrogeco astrogeco changed the base branch from main to integration-candidate March 17, 2021 22:53
@astrogeco astrogeco mentioned this pull request Mar 17, 2021
Merged
@astrogeco astrogeco merged commit c332d9b into nasa:integration-candidate Mar 17, 2021
astrogeco added a commit to nasa/cFS that referenced this pull request Mar 17, 2021
@astrogeco
Add FastTracked osal PRs
00c58b8 
nasa/osal#890 - Fix #875 - move copyblock size to a #define and add comments
nasa/osal#891 - Fix #873 - removed rogue while loop
nasa/osal#892 - Fix #868 - scripted replacement for #include <os and #include <OSC_ matches of < and > with "
nasa/osal#893 - Fix #859 - consolidates the duplicated switch in OS_SocketOpen_Impl
nasa/osal#894 - Fix #854 - Const correct input pointers
nasa/osal#895 - Fix #851 - removed network prototypes defined in osapi_sockets.h that are also in osapi_network.h
nasa/osal#896 - Fix #842 - removes NULL redefine from common_types.h
nasa/osal#912 - Fix #911 - Add Contributing Guide
astrogeco added a commit to nasa/cFS that referenced this pull request Mar 18, 2021
@astrogeco
IC:2021-03-23, Add FastTracked osal PRs
d61020b 
nasa/osal#890 - Move copyblock size to a #define and add comments
nasa/osal#891 - Removed rogue while loop
nasa/osal#892 - Scripted replacement for #include <os and #include <OSC_ matches of < and > with "
nasa/osal#893 - Consolidates the duplicated switch in OS_SocketOpen_Impl
nasa/osal#894 - Add `const` to input pointers
nasa/osal#895 - Removed network prototypes defined in osapi_sockets.h that are also in osapi_network.h
nasa/osal#896 - Removes NULL redefine from common_types.h
nasa/osal#912 - Add Contributing Guide
astrogeco added a commit to nasa/cFS that referenced this pull request Mar 22, 2021
@astrogeco
cFS Bundle IC:2021-03-23
297fc8f 
nasa/cFE#1243 v6.8.0-rc1+dev436

  nasa/cFE#1225, Add coverage test fix
  nasa/cFE#1218, Adds a local definition of `SOFTWARE_BIG/LITTLE_BIT_ORDER` directly inside `cfe_endian.h` to provide a compatible symbol for apps that still require this. This allows CFE to build and run successfully when OSAL stops providing this in `common_types.h`.
  nasa/cFE#1193, Removes incorrect statements from Application Developers Guide
  nasa/cFE#1235, Fixes truncation handling on vsnprintf error by adding a cast to avoid implicit conversion
  nasa/cFE#1220, Clarify the documentation on SB MsgId regarding requirements for command and telemetry messages
  nasa/cFE#1230, Avoids undefined behavior and resolves static analysis warnings by casting `isspace` input to `unsigned char`.
  nasa/cFE#1231, Updates message module and msgid v1, `CFE_MSG_SetMsgId`, to use mask instead of cast to alter value. Resolves static analysis warning.
  nasa/cFE#1232, Updates `CFE_ES_FileWriteByteCntErr` to report status, not a `size_t` actual since `OS_write` returns `int32`. Use `int16` for local type from `CFE_TBL_FindTableInRegistry` since it's an index, not a status.
  nasa/cFE#1228, Replaces `<>` with `"` in local `#include`s
  nasa/cFE#1227, Adds `CONTRIBUING.md` that links to the main cFS contributing guide.

nasa/PSP#273 v1.5.0-rc1+dev90

  nasa/PSP#264, modular psp implementation
  nasa/PSP#272, Use quotes for local includes
  nasa/PSP#271, Add Contributing Guide

nasa/osal#917 v5.1.0-rc1+dev347

  nasa/osal#890, Move copyblock size to a #define and add comments
  nasa/osal#891, Removed rogue while loop
  nasa/osal#892, Scripted replacement for #include <os and #include <OSC_ matches of < and > with "
  nasa/osal#893, Consolidates the duplicated switch in OS_SocketOpen_Impl
  nasa/osal#894, Add `const` to input pointers
  nasa/osal#895, Removed network prototypes defined in osapi_sockets.h that are also in osapi_network.h
  nasa/osal#896, Removes NULL redefine from common_types.h
  nasa/osal#912, Add Contributing Guide
  nasa/osal#914, Utilize UTASSERT_CASETYPE_NA to report OS_ERR_NOT_IMPLEMENTED
  nasa/osal#898, correct interval calculation in DoSelect
  nasa/osal#909, comments describing select after connect
  nasa/osal#902, add check for EAGAIN in addition to EINTR
  nasa/osal#908, compile time assert for sockaddr size
  nasa/osal#910, check/report fcntl status
  nasa/osal#897, Add assert for FD_SET_SIZE in relation to OSAL_set
  nasa/osal#903, better error translation for ESPIPE errno
  nasa/osal#840, add shell functional test
  nasa/osal#901, rename OS_U32ValueWrapper_t
  nasa/osal#900, break up logic in return statement
  nasa/osal#906, return moduleInfoGet error
  nasa/osal#907, report timer_gettime error
  nasa/osal#899, remove unreachable test
  nasa/osal#905, make module comment same as other services
  nasa/osal#920 to fix test error check index inside fdset conversions
  nasa/osal#922, make non-selectable FD an error

nasa/sample_app#137 v1.2.0-rc1+dev54

  nasa/sample_app#134, Convert from <> to " for local includes
  nasa/sample_app#136, Added a contributing guide that links to the main cFS contributing guide.
  nasa/sample_app#132, Add context to the values for MsgIDs

nasa/sample_lib#55 v1.2.0-rc1+dev30

  nasa/sample_lib#54, Replace <> with " for local includes
  nasa/sample_lib#53, Adds CONTRIBUTING.md that links to the main cFS contributing guide.

nasa/cFS-GroundSystem#171 v2.2.0-rc1+dev41

  nasa/cFS-GroundSystem#166, Updated TBL and SB tlm for an operational TLM display
  nasa/cFS-GroundSystem#170, Add Contributing Guide
  nasa/cFS-GroundSystem#137, Create package for cfs-groundsystem
astrogeco added a commit to nasa/cFS that referenced this pull request Mar 22, 2021
@astrogeco
cFS Bundle Integration Candidate: 2021-03-23
d4170e4 
nasa/cFE#1243 v6.8.0-rc1+dev436

  nasa/cFE#1225, Add coverage test fix
  nasa/cFE#1218, bit order macros
  nasa/cFE#1193, Removes incorrect statements from Application Developers Guide
  nasa/cFE#1235, Fixes truncation handling on vsnprintf error by adding a cast to avoid implicit conversion
  nasa/cFE#1220, Clarify the documentation on SB MsgId regarding requirements for command and telemetry messages
  nasa/cFE#1230, Cast isspace input to unsigned char to avoid undefined behavior
  nasa/cFE#1231, Updated message module, msgid v1 to use mask instead of cast to alter value
  nasa/cFE#1232, Coercion alters value caused by incorrect type - static analysis warning
  nasa/cFE#1228, Replaces `<>` with `"` in local `#include`s
  nasa/cFE#1227, Adds `CONTRIBUING.md` that links to the main cFS contributing guide.

nasa/PSP#273 v1.5.0-rc1+dev90

  nasa/PSP#264, modular psp implementation
  nasa/PSP#272, Use quotes for local includes
  nasa/PSP#271, Add Contributing Guide

nasa/osal#917 v5.1.0-rc1+dev347

  nasa/osal#890, Move copyblock size to a #define and add comments
  nasa/osal#891, Removed rogue while loop
  nasa/osal#892, Scripted replacement for #include <os and #include <OSC_ matches of < and > with "
  nasa/osal#893, Consolidates the duplicated switch in OS_SocketOpen_Impl
  nasa/osal#894, Add `const` to input pointers
  nasa/osal#895, Removed network prototypes defined in osapi_sockets.h that are also in osapi_network.h
  nasa/osal#896, Removes NULL redefine from common_types.h
  nasa/osal#912, Add Contributing Guide
  nasa/osal#914, Utilize UTASSERT_CASETYPE_NA to report OS_ERR_NOT_IMPLEMENTED
  nasa/osal#898, correct interval calculation in DoSelect
  nasa/osal#909, comments describing select after connect
  nasa/osal#902, add check for EAGAIN in addition to EINTR
  nasa/osal#908, compile time assert for sockaddr size
  nasa/osal#910, check/report fcntl status
  nasa/osal#897, Add assert for FD_SET_SIZE in relation to OSAL_set
  nasa/osal#903, better error translation for ESPIPE errno
  nasa/osal#840, add shell functional test
  nasa/osal#901, rename OS_U32ValueWrapper_t
  nasa/osal#900, break up logic in return statement
  nasa/osal#906, return moduleInfoGet error
  nasa/osal#907, report timer_gettime error
  nasa/osal#899, remove unreachable test
  nasa/osal#905, make module comment same as other services
  nasa/osal#920 to fix test error check index inside fdset conversions
  nasa/osal#922, make non-selectable FD an error

nasa/sample_app#137 v1.2.0-rc1+dev54

  nasa/sample_app#134, Convert from <> to " for local includes
  nasa/sample_app#136, Added a contributing guide that links to the main cFS contributing guide.
  nasa/sample_app#132, Add context to the values for MsgIDs

nasa/sample_lib#55 v1.2.0-rc1+dev30

  nasa/sample_lib#54, Replace <> with " for local includes
  nasa/sample_lib#53, Adds CONTRIBUTING.md that links to the main cFS contributing guide.

nasa/cFS-GroundSystem#171 v2.2.0-rc1+dev41

  nasa/cFS-GroundSystem#166, Updated TBL and SB tlm for an operational TLM display
  nasa/cFS-GroundSystem#170, Add Contributing Guide
  nasa/cFS-GroundSystem#137, Create package for cfs-groundsystem
@skliper skliper deleted the fix868-include_quotes branch April 1, 2021 20:06
jphickey pushed a commit to jphickey/osal that referenced this pull request Aug 10, 2022
@yammajamma
Merge pull request nasa#892 from skliper/fix890-calccrc-rtn-stub
a713784 
Fix nasa#890, CFE_ES_CalculateCRC default stub behavior
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zanzaben zanzaben zanzaben approved these changes

Assignees
No one assigned
Labels
CCB:FastTrack
Projects
None yet
Milestone
Caelum
Development

Successfully merging this pull request may close these issues.

Scrub for include <> vs "" use (<> should be system only)
3 participants
@skliper @zanzaben @astrogeco