public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
* [PATCH] SecurityPkg/SecureBootConfigImpl.c: Fix coding style issue.
@ 2017-10-10  2:08 chenc2
  2017-10-10  2:34 ` Bi, Dandan
  2017-10-10  2:46 ` Zhang, Chao B
  0 siblings, 2 replies; 3+ messages in thread
From: chenc2 @ 2017-10-10  2:08 UTC (permalink / raw)
  To: edk2-devel; +Cc: chenc2, Bi Dandan, Zhang Chao

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/SecureBootConfigImpl.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/SecureBootConfigImpl.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



^ permalink raw reply related	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-10-10  2:43 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-10-10  2:08 [PATCH] SecurityPkg/SecureBootConfigImpl.c: Fix coding style issue chenc2
2017-10-10  2:34 ` Bi, Dandan
2017-10-10  2:46 ` Zhang, Chao B

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox