From 244790adfa626fbdbaf8cebec2f1b4759b12456b Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 19 Feb 2025 03:46:55 +0900 Subject: [PATCH] hwdb-util: drop unused value assignment The values assigned to 'r' were never used, and overwritten by the next call of read_line_full(). Fixes CID#1548043 and CID#1548064. (cherry picked from commit 00575cfd696a2a335decb66580727fafd3c152aa) --- src/shared/hwdb-util.c | 36 +++++++++++++++--------------------- 1 file changed, 15 insertions(+), 21 deletions(-) diff --git a/src/shared/hwdb-util.c b/src/shared/hwdb-util.c index bc4da846f1b..3efae8a3a58 100644 --- a/src/shared/hwdb-util.c +++ b/src/shared/hwdb-util.c @@ -461,7 +461,7 @@ static int import_file(struct trie *trie, const char *filename, uint16_t file_pr _cleanup_fclose_ FILE *f = NULL; _cleanup_strv_free_ char **match_list = NULL; uint32_t line_number = 0; - int r, err; + int r; f = fopen(filename, "re"); if (!f) @@ -501,24 +501,23 @@ static int import_file(struct trie *trie, const char *filename, uint16_t file_pr break; if (line[0] == ' ') { - r = log_syntax(NULL, LOG_WARNING, filename, line_number, SYNTHETIC_ERRNO(EINVAL), - "Match expected but got indented property \"%s\", ignoring line.", line); + log_syntax(NULL, LOG_WARNING, filename, line_number, 0, + "Match expected but got indented property \"%s\", ignoring line.", line); break; } /* start of record, first match */ state = HW_MATCH; - err = strv_extend(&match_list, line); - if (err < 0) - return err; - + r = strv_extend(&match_list, line); + if (r < 0) + return r; break; case HW_MATCH: if (len == 0) { - r = log_syntax(NULL, LOG_WARNING, filename, line_number, SYNTHETIC_ERRNO(EINVAL), - "Property expected, ignoring record with no properties."); + log_syntax(NULL, LOG_WARNING, filename, line_number, 0, + "Property expected, ignoring record with no properties."); state = HW_NONE; match_list = strv_free(match_list); break; @@ -526,18 +525,15 @@ static int import_file(struct trie *trie, const char *filename, uint16_t file_pr if (line[0] != ' ') { /* another match */ - err = strv_extend(&match_list, line); - if (err < 0) - return err; - + r = strv_extend(&match_list, line); + if (r < 0) + return r; break; } /* first data */ state = HW_DATA; - err = insert_data(trie, match_list, line, filename, file_priority, line_number, compat); - if (err < 0) - r = err; + (void) insert_data(trie, match_list, line, filename, file_priority, line_number, compat); break; case HW_DATA: @@ -549,16 +545,14 @@ static int import_file(struct trie *trie, const char *filename, uint16_t file_pr } if (line[0] != ' ') { - r = log_syntax(NULL, LOG_WARNING, filename, line_number, SYNTHETIC_ERRNO(EINVAL), - "Property or empty line expected, got \"%s\", ignoring record.", line); + log_syntax(NULL, LOG_WARNING, filename, line_number, 0, + "Property or empty line expected, got \"%s\", ignoring record.", line); state = HW_NONE; match_list = strv_free(match_list); break; } - err = insert_data(trie, match_list, line, filename, file_priority, line_number, compat); - if (err < 0) - r = err; + (void) insert_data(trie, match_list, line, filename, file_priority, line_number, compat); break; }; } -- 2.47.3