Skip to content

Commit 47575fa

Browse files
committed
treewide: Pass string literals in SetupResetReminder
Signed-off-by: Michał Żygowski <michal.zygowski@3mdeb.com>
1 parent 76d5b78 commit 47575fa

File tree

4 files changed

+24
-48
lines changed

4 files changed

+24
-48
lines changed

MdeModulePkg/Application/UiApp/FrontPage.c

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1132,29 +1132,23 @@ SetupResetReminder (
11321132
)
11331133
{
11341134
EFI_INPUT_KEY Key;
1135-
CHAR16 *StringBuffer1;
1136-
CHAR16 *StringBuffer2;
11371135

11381136
//
11391137
// check any reset required change is applied? if yes, reset system
11401138
//
11411139
if (IsResetRequired ()) {
1142-
StringBuffer1 = AllocateZeroPool (MAX_STRING_LEN * sizeof (CHAR16));
1143-
ASSERT (StringBuffer1 != NULL);
1144-
StringBuffer2 = AllocateZeroPool (MAX_STRING_LEN * sizeof (CHAR16));
1145-
ASSERT (StringBuffer2 != NULL);
1146-
StrCpyS (StringBuffer1, MAX_STRING_LEN, L"Configuration changed. Reset to apply it Now.");
1147-
StrCpyS (StringBuffer2, MAX_STRING_LEN, L"Press ENTER to reset");
11481140
//
11491141
// Popup a menu to notice user
11501142
//
11511143
do {
1152-
CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, StringBuffer1, StringBuffer2, NULL);
1144+
CreatePopUp (
1145+
EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,
1146+
&Key,
1147+
L"Configuration changed. Reset to apply it Now.",
1148+
L"Press ENTER to reset",
1149+
NULL);
11531150
} while (Key.UnicodeChar != CHAR_CARRIAGE_RETURN);
11541151

1155-
FreePool (StringBuffer1);
1156-
FreePool (StringBuffer2);
1157-
11581152
gRT->ResetSystem (EfiResetCold, EFI_SUCCESS, 0, NULL);
11591153
}
11601154
}

MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootOption.c

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ BmmSetupResetReminder (
2828
)
2929
{
3030
EFI_INPUT_KEY Key;
31-
CHAR16 *StringBuffer1;
32-
CHAR16 *StringBuffer2;
3331
EFI_STATUS Status;
3432
EDKII_FORM_BROWSER_EXTENSION2_PROTOCOL *FormBrowserEx2;
3533

@@ -42,22 +40,18 @@ BmmSetupResetReminder (
4240
// check any reset required change is applied? if yes, reset system
4341
//
4442
if (!EFI_ERROR (Status) && FormBrowserEx2->IsResetRequired ()) {
45-
StringBuffer1 = AllocateZeroPool (MAX_CHAR * sizeof (CHAR16));
46-
ASSERT (StringBuffer1 != NULL);
47-
StringBuffer2 = AllocateZeroPool (MAX_CHAR * sizeof (CHAR16));
48-
ASSERT (StringBuffer2 != NULL);
49-
StrCpyS (StringBuffer1, MAX_CHAR, L"Configuration changed. Reset to apply it Now.");
50-
StrCpyS (StringBuffer2, MAX_CHAR, L"Press ENTER to reset");
5143
//
5244
// Popup a menu to notice user
5345
//
5446
do {
55-
CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, StringBuffer1, StringBuffer2, NULL);
47+
CreatePopUp (
48+
EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,
49+
&Key,
50+
L"Configuration changed. Reset to apply it Now.",
51+
L"Press ENTER to reset",
52+
NULL);
5653
} while (Key.UnicodeChar != CHAR_CARRIAGE_RETURN);
5754

58-
FreePool (StringBuffer1);
59-
FreePool (StringBuffer2);
60-
6155
gRT->ResetSystem (EfiResetCold, EFI_SUCCESS, 0, NULL);
6256
}
6357
}

MdeModulePkg/Library/BootManagerUiLib/BootManager.c

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -305,8 +305,6 @@ BmSetupResetReminder (
305305
)
306306
{
307307
EFI_INPUT_KEY Key;
308-
CHAR16 *StringBuffer1;
309-
CHAR16 *StringBuffer2;
310308
EFI_STATUS Status;
311309
EDKII_FORM_BROWSER_EXTENSION2_PROTOCOL *FormBrowserEx2;
312310

@@ -318,22 +316,18 @@ BmSetupResetReminder (
318316
// check any reset required change is applied? if yes, reset system
319317
//
320318
if (!EFI_ERROR (Status) && FormBrowserEx2->IsResetRequired ()) {
321-
StringBuffer1 = AllocateZeroPool (MAX_STRING_LEN * sizeof (CHAR16));
322-
ASSERT (StringBuffer1 != NULL);
323-
StringBuffer2 = AllocateZeroPool (MAX_STRING_LEN * sizeof (CHAR16));
324-
ASSERT (StringBuffer2 != NULL);
325-
StrCpyS (StringBuffer1, MAX_STRING_LEN, L"Configuration changed. Reset to apply it Now.");
326-
StrCpyS (StringBuffer2, MAX_STRING_LEN, L"Press ENTER to reset");
327319
//
328320
// Popup a menu to notice user
329321
//
330322
do {
331-
CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, StringBuffer1, StringBuffer2, NULL);
323+
CreatePopUp (
324+
EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,
325+
&Key,
326+
L"Configuration changed. Reset to apply it Now.",
327+
L"Press ENTER to reset",
328+
NULL);
332329
} while (Key.UnicodeChar != CHAR_CARRIAGE_RETURN);
333330

334-
FreePool (StringBuffer1);
335-
FreePool (StringBuffer2);
336-
337331
gRT->ResetSystem (EfiResetCold, EFI_SUCCESS, 0, NULL);
338332
}
339333
}

SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4867,8 +4867,6 @@ SetupResetReminder (
48674867
)
48684868
{
48694869
EFI_INPUT_KEY Key;
4870-
CHAR16 *StringBuffer1;
4871-
CHAR16 *StringBuffer2;
48724870
EFI_STATUS Status;
48734871
EDKII_FORM_BROWSER_EXTENSION2_PROTOCOL *FormBrowserEx2;
48744872

@@ -4881,22 +4879,18 @@ SetupResetReminder (
48814879
// check any reset required change is applied? if yes, reset system
48824880
//
48834881
if (!EFI_ERROR (Status) && FormBrowserEx2->IsResetRequired ()) {
4884-
StringBuffer1 = AllocateZeroPool (MAX_CHAR * sizeof (CHAR16));
4885-
ASSERT (StringBuffer1 != NULL);
4886-
StringBuffer2 = AllocateZeroPool (MAX_CHAR * sizeof (CHAR16));
4887-
ASSERT (StringBuffer2 != NULL);
4888-
StrCpyS (StringBuffer1, MAX_CHAR, L"Configuration changed. Reset to apply it Now.");
4889-
StrCpyS (StringBuffer2, MAX_CHAR, L"Press ENTER to reset");
48904882
//
48914883
// Popup a menu to notice user
48924884
//
48934885
do {
4894-
CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, StringBuffer1, StringBuffer2, NULL);
4886+
CreatePopUp (
4887+
EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,
4888+
&Key,
4889+
L"Configuration changed. Reset to apply it Now.",
4890+
L"Press ENTER to reset",
4891+
NULL);
48954892
} while (Key.UnicodeChar != CHAR_CARRIAGE_RETURN);
48964893

4897-
FreePool (StringBuffer1);
4898-
FreePool (StringBuffer2);
4899-
49004894
gRT->ResetSystem (EfiResetCold, EFI_SUCCESS, 0, NULL);
49014895
}
49024896
}

0 commit comments

Comments
 (0)