SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bootctl: various coding style updates

Browse Source
This commit is contained in:
Lennart Poettering
2016-07-21 11:37:58 +02:00
parent db6d9faeb0
commit f939cff715
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/boot/bootctl.c
+8 -9
View File
@@ -416,9 +416,10 @@ static int status_variables(void) {
n_options = efi_get_boot_options(&options); n_options = efi_get_boot_options(&options);
if (n_options == -ENOENT) 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/."); " 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"); return log_error_errno(n_options, "Failed to read EFI boot entries: %m");
n_order = efi_get_boot_order(&order); n_order = efi_get_boot_order(&order);
@@ -438,11 +439,9 @@ static int status_variables(void) {
for (j = 0; j < n_order; j++) for (j = 0; j < n_order; j++)
if (options[i] == order[j]) if (options[i] == order[j])
goto next; continue;
print_efi_option(options[i], false); print_efi_option(options[i], false);
next:
continue;
} }
return 0; return 0;
@@ -820,8 +819,8 @@ static int install_variables(const char *esp_path,
if (access(p, F_OK) < 0) { if (access(p, F_OK) < 0) {
if (errno == ENOENT) if (errno == ENOENT)
return 0; 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); 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) if (in_order)
return remove_from_order(slot); return remove_from_order(slot);
else
return 0; return 0;
} }
static int install_loader_config(const char *esp_path) { static int install_loader_config(const char *esp_path) {