summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-02-19 17:51:08 +0100
committerLennart Poettering <lennart@poettering.net>2014-02-19 17:53:50 +0100
commitd4f1ef4437e59b2cb69a201bb086ab23070ea72d (patch)
tree01a9edd030f2616cb68a4811d765f4e3f19500b5 /src
parent0f0e240cb8625d832e760ef32ed772e21c316905 (diff)
udev: make sure we always return a valid error code in trie_store()
Diffstat (limited to 'src')
-rw-r--r--src/udev/udevadm-hwdb.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/udev/udevadm-hwdb.c b/src/udev/udevadm-hwdb.c
index 16abbe8d2f..65cbf61865 100644
--- a/src/udev/udevadm-hwdb.c
+++ b/src/udev/udevadm-hwdb.c
@@ -341,7 +341,7 @@ static int trie_store(struct trie *trie, const char *filename) {
struct trie_f t = {
.trie = trie,
};
- char *filename_tmp;
+ _cleanup_free_ char *filename_tmp = NULL;
int64_t pos;
int64_t root_off;
int64_t size;
@@ -385,8 +385,8 @@ static int trie_store(struct trie *trie, const char *filename) {
err = -errno;
fclose(t.f);
if (err < 0 || rename(filename_tmp, filename) < 0) {
- unlink(filename_tmp);
- goto out;
+ unlink_noerrno(filename_tmp);
+ return err < 0 ? err : -errno;
}
log_debug("=== trie on-disk ===");
@@ -400,9 +400,8 @@ static int trie_store(struct trie *trie, const char *filename) {
t.values_count * sizeof(struct trie_value_entry_f), t.values_count);
log_debug("string store: %8zu bytes", trie->strings->len);
log_debug("strings start: %8"PRIu64, t.strings_off);
-out:
- free(filename_tmp);
- return err;
+
+ return 0;
}
static int insert_data(struct trie *trie, struct udev_list *match_list,