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

hwdb: use _cleanup_ attribute at one more place

Browse Source
This commit is contained in:
Yu Watanabe
2018-09-19 16:52:59 +09:00
parent bf84dc168c
commit 4d7783e937
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/hwdb/hwdb.c
+9 -11
View File
@@ -202,9 +202,9 @@ static int trie_insert(struct trie *trie, struct trie_node *node, const char *se
struct trie_node *child;
for (p = 0; (c = trie->strings->buf[node->prefix_off + p]); p++) {
_cleanup_free_ struct trie_node *new_child = NULL;
_cleanup_free_ char *s = NULL;
ssize_t off;
_cleanup_free_ struct trie_node *new_child = NULL;
if (c == search[i + p])
continue;
@@ -250,26 +250,24 @@ static int trie_insert(struct trie *trie, struct trie_node *node, const char *se
child = node_lookup(node, c);
if (!child) {
_cleanup_free_ struct trie_node *new_child = NULL;
ssize_t off;
/* new child */
child = new0(struct trie_node, 1);
if (!child)
new_child = new0(struct trie_node, 1);
if (!new_child)
return -ENOMEM;
off = strbuf_add_string(trie->strings, search + i+1, strlen(search + i+1));
if (off < 0) {
free(child);
if (off < 0)
return off;
}
child->prefix_off = off;
r = node_add_child(trie, node, child, c);
if (r < 0) {
free(child);
new_child->prefix_off = off;
r = node_add_child(trie, node, new_child, c);
if (r < 0)
return r;
}
child = TAKE_PTR(new_child);
return trie_node_add_value(trie, child, key, value, filename, file_priority, line_number);
}