SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hwdb: use strv_extend() where we can

Browse Source
This commit is contained in:
Lennart Poettering
2020-01-21 10:13:07 +01:00
parent 2e5180d38b
commit 2aecc66887
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd/sd-hwdb/hwdb-util.c
+2 -11
View File
@@ -477,7 +477,6 @@ 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;
char *match = NULL;
int r = 0, err;
f = fopen(filename, "re");
@@ -527,11 +526,7 @@ static int import_file(struct trie *trie, const char *filename, uint16_t file_pr
/* start of record, first match */
state = HW_MATCH;
match = strdup(line);
if (!match)
return -ENOMEM;
err = strv_consume(&match_list, match);
err = strv_extend(&match_list, line);
if (err < 0)
return err;
@@ -549,11 +544,7 @@ static int import_file(struct trie *trie, const char *filename, uint16_t file_pr
if (line[0] != ' ') {
/* another match */
match = strdup(line);
if (!match)
return -ENOMEM;
err = strv_consume(&match_list, match);
err = strv_extend(&match_list, line);
if (err < 0)
return err;