From 4a62c710b62a5a3c7a8a278b810b9d5b5a0c8f4f Mon Sep 17 00:00:00 2001 From: Michal Schmidt Date: Fri, 28 Nov 2014 19:57:32 +0100 Subject: treewide: another round of simplifications Using the same scripts as in f647962d64e "treewide: yet more log_*_errno + return simplifications". --- src/firstboot/firstboot.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'src/firstboot') diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c index d8fbd5945f..d087ef35e9 100644 --- a/src/firstboot/firstboot.c +++ b/src/firstboot/firstboot.c @@ -336,10 +336,8 @@ static int process_timezone(void) { return log_error_errno(r, "Failed to read host timezone: %m"); mkdir_parents(etc_localtime, 0755); - if (symlink(p, etc_localtime) < 0) { - log_error_errno(errno, "Failed to create %s symlink: %m", etc_localtime); - return -errno; - } + if (symlink(p, etc_localtime) < 0) + return log_error_errno(errno, "Failed to create %s symlink: %m", etc_localtime); log_info("%s copied.", etc_localtime); return 0; @@ -356,10 +354,8 @@ static int process_timezone(void) { e = strappenda("../usr/share/zoneinfo/", arg_timezone); mkdir_parents(etc_localtime, 0755); - if (symlink(e, etc_localtime) < 0) { - log_error_errno(errno, "Failed to create %s symlink: %m", etc_localtime); - return -errno; - } + if (symlink(e, etc_localtime) < 0) + return log_error_errno(errno, "Failed to create %s symlink: %m", etc_localtime); log_info("%s written", etc_localtime); return 0; -- cgit v1.2.3-54-g00ecf