Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-22 13:10:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

[FREELDR] DisplayBootTimeOptions(): Simplify concatenation checks (#4058)

Browse source
This commit is contained in:
Serge Gautherie 2025-03-24 20:14:04 +01:00 committed by GitHub
parent ecb2293d6d
commit 9ecd5fb6fe
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 10 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
boot/freeldr/freeldr/options.c
View file

@ -179,31 +179,32 @@ VOID DoOptionsMenu(IN OperatingSystemItem* OperatingSystem)
VOID DisplayBootTimeOptions(VOID) VOID DisplayBootTimeOptions(VOID)
{ {
CHAR BootOptions[260] = ""; CHAR BootOptions[260];
switch (BootOptionChoice) switch (BootOptionChoice)
{ {
case SAFE_MODE: case SAFE_MODE:
strcat(BootOptions, OptionsMenuList[0]); strcpy(BootOptions, OptionsMenuList[0]);
break; break;
case SAFE_MODE_WITH_NETWORKING: case SAFE_MODE_WITH_NETWORKING:
strcat(BootOptions, OptionsMenuList[1]); strcpy(BootOptions, OptionsMenuList[1]);
break; break;
case SAFE_MODE_WITH_COMMAND_PROMPT: case SAFE_MODE_WITH_COMMAND_PROMPT:
strcat(BootOptions, OptionsMenuList[2]); strcpy(BootOptions, OptionsMenuList[2]);
break; break;
case LAST_KNOWN_GOOD_CONFIGURATION: case LAST_KNOWN_GOOD_CONFIGURATION:
strcat(BootOptions, OptionsMenuList[6]); strcpy(BootOptions, OptionsMenuList[6]);
break; break;
case DIRECTORY_SERVICES_RESTORE_MODE: case DIRECTORY_SERVICES_RESTORE_MODE:
strcat(BootOptions, OptionsMenuList[7]); strcpy(BootOptions, OptionsMenuList[7]);
break; break;
default: default:
BootOptions[0] = ANSI_NULL;
break; break;
} }
@ -213,31 +214,23 @@ VOID DisplayBootTimeOptions(VOID)
(BootOptionChoice != SAFE_MODE_WITH_NETWORKING) && (BootOptionChoice != SAFE_MODE_WITH_NETWORKING) &&
(BootOptionChoice != SAFE_MODE_WITH_COMMAND_PROMPT) ) (BootOptionChoice != SAFE_MODE_WITH_COMMAND_PROMPT) )
{ {
if (BootOptionChoice != NO_OPTION) if (BootOptions[0] != ANSI_NULL)
{
strcat(BootOptions, ", "); strcat(BootOptions, ", ");
}
strcat(BootOptions, OptionsMenuList[4]); strcat(BootOptions, OptionsMenuList[4]);
} }
} }
if (VgaMode) if (VgaMode)
{ {
if ((BootOptionChoice != NO_OPTION) || if (BootOptions[0] != ANSI_NULL)
BootLogging)
{
strcat(BootOptions, ", "); strcat(BootOptions, ", ");
}
strcat(BootOptions, OptionsMenuList[5]); strcat(BootOptions, OptionsMenuList[5]);
} }
if (DebuggingMode) if (DebuggingMode)
{ {
if ((BootOptionChoice != NO_OPTION) || if (BootOptions[0] != ANSI_NULL)
BootLogging || VgaMode)
{
strcat(BootOptions, ", "); strcat(BootOptions, ", ");
}
strcat(BootOptions, OptionsMenuList[8]); strcat(BootOptions, OptionsMenuList[8]);
} }