Skip to content
New issue

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

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

Already on GitHub? # to your account

Integration Candidate 20200121 #132

Merged
merged 2 commits into from
Jan 27, 2020
Merged

Integration Candidate 20200121 #132

merged 2 commits into from
Jan 27, 2020

Conversation

skliper
Copy link
Contributor

@skliper skliper commented Jan 21, 2020

Describe the contribution
Fix #128

Testing performed
Steps taken to test the contribution:

  1. Current CI passes
  2. Enhanced CI in Update grut699-vxworks6 cfe_psp_timer.c per white box unit testing results #40 passes debug/with deprecated elements testing

Expected behavior changes
Resolved warnings

System(s) tested on

  • CI: Ubuntu 18.04, IC bundle

Additional context
N/A

Third party code
N/A

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

jphickey and others added 2 commits January 9, 2020 08:56
Instead of directly using a literal, declare a static `char[]`
variable with the string and use that instead.
Fix #128, Do not directly use a literal for char* members
@skliper skliper added this to the 1.5.0 milestone Jan 21, 2020
@skliper
Copy link
Contributor Author

skliper commented Jan 27, 2020

CCB 20200122 - Reviewed and approved for merge to master

@skliper skliper added the CCB:Approved Indicates Approval by CCB label Jan 27, 2020
@skliper skliper merged commit 98e5ce4 into master Jan 27, 2020
@skliper skliper deleted the ic-20200121 branch January 27, 2020 19:55
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
CCB:Approved Indicates Approval by CCB
Projects
None yet
Development

Successfully merging this pull request may close these issues.

RTEMS PSP using string literal for non-const char*
2 participants