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

Codechange: do not declare functions in blocks #10429

Merged
merged 1 commit into from
Jan 29, 2023

Conversation

rubidium42
Copy link
Contributor

Motivation / Problem

CodeQL alerting about functions being declared in blocks. Specifically that even if you declare them in a block, they will become available globally.

Description

Either remove it because it was already declared outside the block, move it to the "global" scope of the cpp file or add the function to a reasonably appropriate header file.

Limitations

None.

Checklist for review

Some things are not automated, and forgotten often. This list is a reminder for the reviewers.

  • The bug fix is important enough to be backported? (label: 'backport requested')
  • This PR touches english.txt or translations? Check the guidelines
  • This PR affects the save game format? (label 'savegame upgrade')
  • This PR affects the GS/AI API? (label 'needs review: Script API')
    • ai_changelog.hpp, gs_changelog.hpp need updating.
    • The compatibility wrappers (compat_*.nut) need updating.
  • This PR affects the NewGRF API? (label 'needs review: NewGRF')

@rubidium42 rubidium42 force-pushed the function-declared-in-block branch 2 times, most recently from f29fee5 to 739176b Compare January 29, 2023 09:46
Copy link
Member

@2TallTyler 2TallTyler left a comment

Choose a reason for hiding this comment

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

All looks good to me, just one tiny nitpick. 🙂

src/newgrf_airporttiles.cpp Outdated Show resolved Hide resolved
@rubidium42 rubidium42 merged commit 4e65ec1 into OpenTTD:master Jan 29, 2023
@rubidium42 rubidium42 deleted the function-declared-in-block branch January 29, 2023 19:28
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.

None yet

2 participants