Minor Settings.c cleanup #1531
Merged
Minor Settings.c cleanup #1531
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
Rather than open-coding it twice, use a shared routine for deleting columns from the Settings structure. In order to improve code readability refactor the screen array deletion similarly and call both routines from Settings_delete.
Be more flexible and consistent with the way other structures are initialised by passing a pointer to struct Machine into the Settings constructor. This would allow other alternative setup of default Meters in the future, e.g. for some nvtop-alike tool sharing code with htop (hypothetically) showing GPUs instead of CPUs by default. Mainly it just makes the code easier to read.
BenBE
reviewed
Sep 3, 2024
|
Further small refactor: diff --git a/Settings.c b/Settings.c
index 6ea15d02..555df42f 100644
--- a/Settings.c
+++ b/Settings.c
@@ -190,14 +190,9 @@ static const char* toFieldName(Hashtable* columns, int id, bool* enabled) {
}
if (id >= ROW_DYNAMIC_FIELDS) {
const DynamicColumn* column = DynamicColumn_lookup(columns, id);
- if (!column) {
- if (enabled)
- *enabled = false;
- return NULL;
- }
if (enabled)
- *enabled = column->enabled;
- return column->name;
+ *enabled = column ? column->enabled : false;
+ return column ? column->name : NULL;
}
if (enabled)
*enabled = true; |
natoscott
force-pushed
the
settings-cleanup
branch
from
571ca63 to
efd05e0
Compare
|
OK, I've reviewed those changes - I merged the size_t changes into one commit, dropped those things that I felt were closer to "code churn" than "code cleanup", and added a commit for that final suggestion. |
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.