summaryrefslogtreecommitdiff
path: root/src/libsystemd/sd-device/device-private.c
diff options
context:
space:
mode:
authorDaniel Mack <github@zonque.org>2015-07-29 20:43:54 +0200
committerDaniel Mack <github@zonque.org>2015-07-29 20:43:54 +0200
commit65c85ef5118d88bc0d3459b6e8854bf1846190b9 (patch)
tree3c60aceafd3cbf6fe12eb6db934350950f4425cd /src/libsystemd/sd-device/device-private.c
parent1051d049a8a5811135d83a89a430c5be846866ca (diff)
parentdacd6cee76a08331b8c8616c5f30f70ee49aa2f9 (diff)
Merge pull request #779 from poettering/fflush-and-check
tree-wide: port everything over to fflush_and_check()
Diffstat (limited to 'src/libsystemd/sd-device/device-private.c')
-rw-r--r--src/libsystemd/sd-device/device-private.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/libsystemd/sd-device/device-private.c b/src/libsystemd/sd-device/device-private.c
index 2e60433246..0ec9667744 100644
--- a/src/libsystemd/sd-device/device-private.c
+++ b/src/libsystemd/sd-device/device-private.c
@@ -1082,12 +1082,10 @@ int device_update_db(sd_device *device) {
return 0;
fail:
- log_error_errno(r, "failed to create %s file '%s' for '%s'", has_info ? "db" : "empty",
- path, device->devpath);
- unlink(path);
- unlink(path_tmp);
+ (void) unlink(path);
+ (void) unlink(path_tmp);
- return r;
+ return log_error_errno(r, "failed to create %s file '%s' for '%s'", has_info ? "db" : "empty", path, device->devpath);
}
int device_delete_db(sd_device *device) {