Games: Change Config read/write types from i32 to u32 to prevent negative values
#25348
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
the
👀 pr-needs-review
|
Your commit message should explain what motivated this change/why this is necessary. |
ninadsachania
force-pushed
the
games-change-config-rw-types
branch
from
bdb6107
to
a4fc635
Compare
Done. Motivation: All these values should never have negative values. |
ninadsachania
changed the title
i32 to u32i32 to u32 to prevent negative values
| @@ -173,8 +173,8 @@ ErrorOr<int> serenity_main(Main::Arguments arguments) | |||
| chess_widget.set_time_control_increment(new_game_dialog->time_control_increment()); | |||
|
|
|||
| Config::write_bool("Games"sv, "Chess"sv, "UnlimitedTimeControl"sv, new_game_dialog->unlimited_time_control()); | |||
| Config::write_i32("Games"sv, "Chess"sv, "TimeControlSeconds"sv, new_game_dialog->time_control_seconds()); | |||
| Config::write_i32("Games"sv, "Chess"sv, "TimeControlIncrement"sv, new_game_dialog->time_control_increment()); | |||
| Config::write_u32("Games"sv, "Chess"sv, "TimeControlSeconds"sv, new_game_dialog->time_control_seconds()); | |||
There was a problem hiding this comment.
you are implicitly converting int to uint here. If you want to change this to u32, consider changing the time-related member variables.
|
|
||
| Config::write_i32("Flood"sv, ""sv, "board_rows"sv, board_rows); | ||
| Config::write_i32("Flood"sv, ""sv, "board_columns"sv, board_columns); | ||
| Config::write_u32("Flood"sv, ""sv, "board_rows"sv, board_rows); |
There was a problem hiding this comment.
Are you sure size_t and unsigned int are the same? If not, I suggest changing types of these variables to unsigned int in all the files in the Flood directory. Otherwise, feel free to leave it as is.
| @@ -25,8 +25,8 @@ WordGame::WordGame() | |||
| : m_clear_message_timer(Core::Timer::create_single_shot(5000, [this] { clear_message(); })) | |||
| { | |||
| read_words(); | |||
| m_num_letters = Config::read_i32("MasterWord"sv, ""sv, "word_length"sv, 5); | |||
| m_max_guesses = Config::read_i32("MasterWord"sv, ""sv, "max_guesses"sv, 6); | |||
| m_num_letters = Config::read_u32("MasterWord"sv, ""sv, "word_length"sv, 5); | |||
There was a problem hiding this comment.
the same comment as in the Flood files applies here, too.
| @@ -48,17 +48,17 @@ ErrorOr<int> serenity_main(Main::Arguments arguments) | |||
| TRY(Core::System::unveil("/res", "r")); | |||
| TRY(Core::System::unveil(nullptr, nullptr)); | |||
|
|
|||
| size_t board_size = Config::read_i32("2048"sv, ""sv, "board_size"sv, 4); | |||
| u32 target_tile = Config::read_i32("2048"sv, ""sv, "target_tile"sv, 2048); | |||
| size_t board_size = Config::read_u32("2048"sv, ""sv, "board_size"sv, 4); | |||
There was a problem hiding this comment.
change size_t to unsigned int?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.