Use /etc/hw-release for manufacturer and device name #1
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
spiiroin
requested changes
Aug 2, 2021
src/usb_moded-config.c
Outdated
| // Create a new GKeyFile object and a bitwise list of flags. | ||
| hwReleaseFile = g_key_file_new(); | ||
| if (g_key_file_load_from_file(hwReleaseFile, "/etc/hw-release", G_KEY_FILE_NONE, &error)) { | ||
| return g_key_file_get_string(hwReleaseFile, NULL, "MANUFACTURER", NULL); |
There was a problem hiding this comment.
Does this actually work?
Documentation does not explicitly allow passing NULL group_name.
Code has: g_return_val_if_fail (group_name != NULL, NULL);
Which would indicate that passing null group name is considered an programming error -> some diagnostic logging and NULL return value.
Also, to still allow fallback to config_get_conf_string() below, this should probably return from here only if non-null result was obtained from key file query?
| hwReleaseFile = g_key_file_new(); | ||
| if (g_key_file_load_from_file(hwReleaseFile, "/etc/hw-release", G_KEY_FILE_NONE, &error)) { | ||
| return g_key_file_get_string(hwReleaseFile, NULL, "NAME", NULL); | ||
| } |
There was a problem hiding this comment.
Using a (local) helper function might improve readability vs. verbatim code duplication. Especially if it turns out that g_key_file_xxx() can't be used for this purpose and a custom parser needs to be written.
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.