summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2016-07-19 20:47:09 +0200
committerLennart Poettering <lennart@poettering.net>2016-07-21 11:37:58 +0200
commitf939cff715775553bb1ec903454acf0d95bf5023 (patch)
treef6cfeab8688c4fb19b7fe5834c28518f7785f425
parentdb6d9faeb0179b15cf29e87bd20d29d6210142ef (diff)
bootctl: various coding style updates
-rw-r--r--src/boot/bootctl.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c
index ff14cff166..9cbea5041e 100644
--- a/src/boot/bootctl.c
+++ b/src/boot/bootctl.c
@@ -416,9 +416,10 @@ static int status_variables(void) {
n_options = efi_get_boot_options(&options);
if (n_options == -ENOENT)
- return log_error_errno(ENOENT, "Failed to access EFI variables, efivarfs"
+ return log_error_errno(n_options,
+ "Failed to access EFI variables, efivarfs"
" needs to be available at /sys/firmware/efi/efivars/.");
- else if (n_options < 0)
+ if (n_options < 0)
return log_error_errno(n_options, "Failed to read EFI boot entries: %m");
n_order = efi_get_boot_order(&order);
@@ -438,11 +439,9 @@ static int status_variables(void) {
for (j = 0; j < n_order; j++)
if (options[i] == order[j])
- goto next;
+ continue;
print_efi_option(options[i], false);
- next:
- continue;
}
return 0;
@@ -820,8 +819,8 @@ static int install_variables(const char *esp_path,
if (access(p, F_OK) < 0) {
if (errno == ENOENT)
return 0;
- else
- return log_error_errno(errno, "Cannot access \"%s\": %m", p);
+
+ return log_error_errno(errno, "Cannot access \"%s\": %m", p);
}
r = find_slot(uuid, path, &slot);
@@ -941,8 +940,8 @@ static int remove_variables(sd_id128_t uuid, const char *path, bool in_order) {
if (in_order)
return remove_from_order(slot);
- else
- return 0;
+
+ return 0;
}
static int install_loader_config(const char *esp_path) {