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

Fix #779, Change global vars to not be hidden by local vars. #794

Merged

Conversation

zanzaben
Copy link
Contributor

@zanzaben zanzaben commented Feb 10, 2021

Describe the contribution
Fixes #779
Rename global timer_id to local_timer_Id

Testing performed
Build and run unit test

Expected behavior changes
No impact to behavior

System(s) tested on
Ubuntu 20.04

Contributor Info - All information REQUIRED for consideration of pull request
Alex Campbell GSFC

@zanzaben zanzaben added the CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) label Feb 10, 2021
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.

I'm not sure changing only the case is sufficient... I think there is a coding standard against that (i.e. having two different vars that differ only in capitalization).

Can we call the local one local_timer_id instead?

@skliper
Copy link
Contributor

skliper commented Feb 12, 2021

Coding violation - Correct, I forgot about that one in my suggestion.

@zanzaben zanzaben force-pushed the fix779_local_hide_global_vars branch from e123896 to feff5b2 Compare February 12, 2021 14:41
@zanzaben zanzaben requested a review from jphickey February 12, 2021 14:42
@astrogeco
Copy link
Contributor

CCB 2021-02-17 APPROVED

@astrogeco astrogeco added IC:2021-02-23 and removed CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) labels Feb 17, 2021
@astrogeco astrogeco changed the base branch from main to integration-candidate February 24, 2021 03:37
@astrogeco astrogeco merged commit b7f04a7 into nasa:integration-candidate Feb 24, 2021
astrogeco added a commit to nasa/cFS that referenced this pull request Feb 24, 2021
astrogeco added a commit to nasa/cFS that referenced this pull request Feb 26, 2021
@zanzaben zanzaben deleted the fix779_local_hide_global_vars branch April 2, 2021 14:10
@skliper skliper added this to the 6.0.0 milestone Sep 24, 2021
jphickey pushed a commit to jphickey/osal that referenced this pull request Aug 10, 2022
jphickey pushed a commit to jphickey/osal that referenced this pull request Aug 10, 2022
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.

Local variable hides global in queue-test.c, bin-sem-timeout-test.c, bin-sem-test.c
4 participants