From 78d5d4ed77b53ae1aab49a9e5e0b6949a875db68 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 28 Jan 2019 17:32:46 +0100 Subject: [PATCH] bootctl: use SYNTHETIC_ERRNO() where appropriate --- src/boot/bootctl.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c index dc2fd96628b..1dbe00adb64 100644 --- a/src/boot/bootctl.c +++ b/src/boot/bootctl.c @@ -112,8 +112,7 @@ static int get_file_version(int fd, char **v) { e = memmem(s, st.st_size - (s - buf), " ####", 5); if (!e || e - s < 3) { - log_error("Malformed version string."); - r = -EINVAL; + r = log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Malformed version string."); goto finish; } @@ -386,10 +385,8 @@ static int version_check(int fd_from, const char *from, int fd_to, const char *t "Skipping \"%s\", since it's owned by another boot loader.", to); - if (compare_version(a, b) < 0) { - log_warning("Skipping \"%s\", since a newer boot loader version exists already.", to); - return -ESTALE; - } + if (compare_version(a, b) < 0) + return log_warning_errno(SYNTHETIC_ERRNO(ESTALE), "Skipping \"%s\", since a newer boot loader version exists already.", to); return 0; } -- 2.47.3