From: "Bi, Dandan" <dandan.bi@intel.com>
To: "Chen, Chen A" <chen.a.chen@intel.com>,
"edk2-devel@lists.01.org" <edk2-devel@lists.01.org>
Cc: "Zhang, Chao B" <chao.b.zhang@intel.com>
Subject: Re: [PATCH] SecurityPkg/SecureBootConfigImpl.c: Fix coding style issue.
Date: Tue, 10 Oct 2017 02:34:44 +0000 [thread overview]
Message-ID: <3C0D5C461C9E904E8F62152F6274C0BB3B9A1A6D@shsmsx102.ccr.corp.intel.com> (raw)
In-Reply-To: <20171010020841.19452-1-chen.a.chen@intel.com>
Reviewed-by: Bi Dandan <dandan.bi@intel.com>
Thanks,
Dandan
-----Original Message-----
From: Chen, Chen A
Sent: Tuesday, October 10, 2017 10:09 AM
To: edk2-devel@lists.01.org
Cc: Chen, Chen A <chen.a.chen@intel.com>; Bi, Dandan <dandan.bi@intel.com>; Zhang, Chao B <chao.b.zhang@intel.com>
Subject: [PATCH] SecurityPkg/SecureBootConfigImpl.c: Fix coding style issue.
Fix coding style issue.
Cc: Bi Dandan <dandan.bi@intel.com>
Cc: Zhang Chao <chao.b.zhang@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: chenc2 <chen.a.chen@intel.com>
---
.../SecureBootConfigDxe/SecureBootConfigImpl.c | 30 +++++++++++-----------
.../SecureBootConfigDxe/SecureBootConfigImpl.h | 14 +++++-----
2 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c
index 457e020ece..3e5012e21b 100644
--- a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c
+++ b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootCo
+++ nfigImpl.c
@@ -3098,11 +3098,11 @@ DeleteSignatureEx (
goto ON_EXIT;
}
- if (PrivateData->VariableName == VARIABLE_DB) {
+ if (PrivateData->VariableName == Variable_DB) {
UnicodeSPrint (VariableName, 100, EFI_IMAGE_SECURITY_DATABASE);
- } else if (PrivateData->VariableName == VARIABLE_DBX) {
+ } else if (PrivateData->VariableName == Variable_DBX) {
UnicodeSPrint (VariableName, 100, EFI_IMAGE_SECURITY_DATABASE1);
- } else if (PrivateData->VariableName == VARIABLE_DBT) {
+ } else if (PrivateData->VariableName == Variable_DBT) {
UnicodeSPrint (VariableName, 100, EFI_IMAGE_SECURITY_DATABASE2);
} else {
goto ON_EXIT;
@@ -3149,7 +3149,7 @@ DeleteSignatureEx (
RemainingSize = VariableDataSize;
ListWalker = (EFI_SIGNATURE_LIST *)(VariableData);
- if (DelType == DELETE_SIGNATURE_LIST_ALL) {
+ if (DelType == Delete_Signature_List_All) {
VariableDataSize = 0;
} else {
while ((RemainingSize > 0) && (RemainingSize >= ListWalker->SignatureListSize) && ListIndex < PrivateData->ListIndex) { @@ -3161,7 +3161,7 @@ DeleteSignatureEx (
ListIndex++;
}
- if (CheckedCount == SIGNATURE_DATA_COUNTS (ListWalker) || DelType == DELETE_SIGNATURE_LIST_ONE) {
+ if (CheckedCount == SIGNATURE_DATA_COUNTS (ListWalker) || DelType
+ == Delete_Signature_List_One) {
RemainingSize -= ListWalker->SignatureListSize;
ListWalker = (EFI_SIGNATURE_LIST *)((UINT8 *)ListWalker + ListWalker->SignatureListSize);
} else {
@@ -3685,13 +3685,13 @@ LoadSignatureList (
goto ON_EXIT;
}
- if (PrivateData->VariableName == VARIABLE_DB) {
+ if (PrivateData->VariableName == Variable_DB) {
UnicodeSPrint (VariableName, 100, EFI_IMAGE_SECURITY_DATABASE);
DstFormId = FORMID_SECURE_BOOT_DB_OPTION_FORM;
- } else if (PrivateData->VariableName == VARIABLE_DBX) {
+ } else if (PrivateData->VariableName == Variable_DBX) {
UnicodeSPrint (VariableName, 100, EFI_IMAGE_SECURITY_DATABASE1);
DstFormId = FORMID_SECURE_BOOT_DBX_OPTION_FORM;
- } else if (PrivateData->VariableName == VARIABLE_DBT) {
+ } else if (PrivateData->VariableName == Variable_DBT) {
UnicodeSPrint (VariableName, 100, EFI_IMAGE_SECURITY_DATABASE2);
DstFormId = FORMID_SECURE_BOOT_DBT_OPTION_FORM;
} else {
@@ -4216,11 +4216,11 @@ LoadSignatureData (
goto ON_EXIT;
}
- if (PrivateData->VariableName == VARIABLE_DB) {
+ if (PrivateData->VariableName == Variable_DB) {
UnicodeSPrint (VariableName, 100, EFI_IMAGE_SECURITY_DATABASE);
- } else if (PrivateData->VariableName == VARIABLE_DBX) {
+ } else if (PrivateData->VariableName == Variable_DBX) {
UnicodeSPrint (VariableName, 100, EFI_IMAGE_SECURITY_DATABASE1);
- } else if (PrivateData->VariableName == VARIABLE_DBT) {
+ } else if (PrivateData->VariableName == Variable_DBT) {
UnicodeSPrint (VariableName, 100, EFI_IMAGE_SECURITY_DATABASE2);
} else {
goto ON_EXIT;
@@ -4618,7 +4618,7 @@ SecureBootCallback (
// From DBX option to the level-1 form, display signature list.
//
case KEY_VALUE_FROM_DBX_TO_LIST_FORM:
- Private->VariableName = VARIABLE_DBX;
+ Private->VariableName = Variable_DBX;
LoadSignatureList (
Private,
LABEL_SIGNATURE_LIST_START,
@@ -4640,7 +4640,7 @@ SecureBootCallback (
);
if (Key.UnicodeChar == L'Y' || Key.UnicodeChar == L'y') {
- DeleteSignatureEx (Private, DELETE_SIGNATURE_LIST_ALL, IfrNvData->CheckedDataCount);
+ DeleteSignatureEx (Private, Delete_Signature_List_All,
+ IfrNvData->CheckedDataCount);
}
LoadSignatureList (
@@ -4664,7 +4664,7 @@ SecureBootCallback (
);
if (Key.UnicodeChar == L'Y' || Key.UnicodeChar == L'y') {
- DeleteSignatureEx (Private, DELETE_SIGNATURE_LIST_ONE, IfrNvData->CheckedDataCount);
+ DeleteSignatureEx (Private, Delete_Signature_List_One,
+ IfrNvData->CheckedDataCount);
}
LoadSignatureList (
@@ -4688,7 +4688,7 @@ SecureBootCallback (
);
if (Key.UnicodeChar == L'Y' || Key.UnicodeChar == L'y') {
- DeleteSignatureEx (Private, DELETE_SIGNATURE_DATA, IfrNvData->CheckedDataCount);
+ DeleteSignatureEx (Private, Delete_Signature_Data,
+ IfrNvData->CheckedDataCount);
}
LoadSignatureList (
diff --git a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.h b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.h
index 52ad91b002..e8ae992dd2 100644
--- a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.h
+++ b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootCo
+++ nfigImpl.h
@@ -152,16 +152,16 @@ typedef struct {
} HII_VENDOR_DEVICE_PATH;
typedef enum {
- VARIABLE_DB,
- VARIABLE_DBX,
- VARIABLE_DBT,
- VARIABLE_MAX
+ Variable_DB,
+ Variable_DBX,
+ Variable_DBT,
+ Variable_MAX
} CURRENT_VARIABLE_NAME;
typedef enum {
- DELETE_SIGNATURE_LIST_ALL,
- DELETE_SIGNATURE_LIST_ONE,
- DELETE_SIGNATURE_DATA
+ Delete_Signature_List_All,
+ Delete_Signature_List_One,
+ Delete_Signature_Data
}SIGNATURE_DELETE_TYPE;
typedef struct {
--
2.13.2.windows.1
next prev parent reply other threads:[~2017-10-10 2:31 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-10 2:08 [PATCH] SecurityPkg/SecureBootConfigImpl.c: Fix coding style issue chenc2
2017-10-10 2:34 ` Bi, Dandan [this message]
2017-10-10 2:46 ` Zhang, Chao B
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3C0D5C461C9E904E8F62152F6274C0BB3B9A1A6D@shsmsx102.ccr.corp.intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox