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

efi/boot: split out helper to reduce duplicate formatting code

Browse Source 
No functional change.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2023-10-12 12:13:56 +02:00
parent 56747a1f13
commit 1f6dbf7021
1 changed files with 15 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/boot/efi/boot.c
+15 -25
View File
@@ -442,6 +442,19 @@ static bool ps_continue(void) {
!IN_SET(key, KEYPRESS(0, SCAN_ESC, 0), KEYPRESS(0, 0, 'q'), KEYPRESS(0, 0, 'Q'));
}
static void print_timeout_status(const char *label, uint32_t t) {
switch (t) {
case TIMEOUT_UNSET:
return;
case TIMEOUT_MENU_FORCE:
return (void) printf("%s: menu-force\n", label);
case TIMEOUT_MENU_HIDDEN:
return (void) printf("%s: menu-hidden\n", label);
default:
return (void) printf("%s: %u s\n", label, t);
}
}
static void print_status(Config *config, char16_t *loaded_image_path) {
size_t x_max, y_max;
uint32_t screen_width = 0, screen_height = 0;
@@ -479,31 +492,8 @@ static void print_status(Config *config, char16_t *loaded_image_path) {
if (!ps_continue())
return;
switch (config->timeout_sec_config) {
case TIMEOUT_UNSET:
break;
case TIMEOUT_MENU_FORCE:
printf(" timeout (config): menu-force\n");
break;
case TIMEOUT_MENU_HIDDEN:
printf(" timeout (config): menu-hidden\n");
break;
default:
printf(" timeout (config): %u s\n", config->timeout_sec_config);
}
switch (config->timeout_sec_efivar) {
case TIMEOUT_UNSET:
break;
case TIMEOUT_MENU_FORCE:
printf(" timeout (EFI var): menu-force\n");
break;
case TIMEOUT_MENU_HIDDEN:
printf(" timeout (EFI var): menu-hidden\n");
break;
default:
printf(" timeout (EFI var): %u s\n", config->timeout_sec_efivar);
}
print_timeout_status(" timeout (config)", config->timeout_sec_config);
print_timeout_status(" timeout (EFI var)", config->timeout_sec_efivar);
if (config->entry_default_config)
printf(" default (config): %ls\n", config->entry_default_config);