FmpDevicePkg: Apply uncrustify changes

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3737

Apply uncrustify changes to .c/.h files in the FmpDevicePkg package

Cc: Andrew Fish <afish@apple.com>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>

1 files changed, 44 insertions, 44 deletions

diff --git a/FmpDevicePkg/Test/UnitTest/Library/FmpDependencyLib/EvaluateDependencyUnitTest.c b/FmpDevicePkg/Test/UnitTest/Library/FmpDependencyLib/EvaluateDependencyUnitTest.c
index 01ac19a7d5..0edb7f6730 100644
--- a/FmpDevicePkg/Test/UnitTest/Library/FmpDependencyLib/EvaluateDependencyUnitTest.c
+++ b/FmpDevicePkg/Test/UnitTest/Library/FmpDependencyLib/EvaluateDependencyUnitTest.c
@@ -19,65 +19,65 @@
 #define UNIT_TEST_APP_VERSION  "1.0"

 

 typedef struct {

-    UINT8       *Dependencies;

-    UINTN       DependenciesSize;

-    BOOLEAN     ExpectedResult;

+  UINT8      *Dependencies;

+  UINTN      DependenciesSize;

+  BOOLEAN    ExpectedResult;

 } BASIC_TEST_CONTEXT;

 

 //

 // Image Type ID of FMP device A

 //

-#define IMAGE_TYPE_ID_1   { 0x97144DFA, 0xEB8E, 0xD14D, {0x8B, 0x4D, 0x39, 0x88, 0x24, 0x96, 0x56, 0x42}}

+#define IMAGE_TYPE_ID_1  { 0x97144DFA, 0xEB8E, 0xD14D, {0x8B, 0x4D, 0x39, 0x88, 0x24, 0x96, 0x56, 0x42}}

 

 //

 // Image Type ID of FMP device B

 //

-#define IMAGE_TYPE_ID_2   { 0xA42A7370, 0x433A, 0x684D, {0x9A, 0xA1, 0xDE, 0x62, 0x23, 0x30, 0x6C, 0xF3}}

+#define IMAGE_TYPE_ID_2  { 0xA42A7370, 0x433A, 0x684D, {0x9A, 0xA1, 0xDE, 0x62, 0x23, 0x30, 0x6C, 0xF3}}

 

 //

 // Device A's version is 0x00000002

 // Device B's version is 0x00000003

 //

-static FMP_DEPEX_CHECK_VERSION_DATA mFmpVersions[] = {

-  {IMAGE_TYPE_ID_1, 0x00000002},

-  {IMAGE_TYPE_ID_2, 0x00000003}

+static FMP_DEPEX_CHECK_VERSION_DATA  mFmpVersions[] = {

+  { IMAGE_TYPE_ID_1, 0x00000002 },

+  { IMAGE_TYPE_ID_2, 0x00000003 }

 };

 

 // Valid Dependency Expression 1: (Version(A) > 0x00000001) && (Version(B) >= 0x00000003)

-static UINT8 mExpression1[] = {

+static UINT8  mExpression1[] = {

   EFI_FMP_DEP_PUSH_VERSION, 0x01, 0x00, 0x00, 0x00,

-  EFI_FMP_DEP_PUSH_GUID, 0xFA, 0x4D, 0x14, 0x97, 0x8E, 0xEB, 0x4D, 0xD1, 0x8B, 0x4D, 0x39, 0x88, 0x24, 0x96, 0x56, 0x42,

+  EFI_FMP_DEP_PUSH_GUID,    0xFA, 0x4D, 0x14, 0x97,0x8E,  0xEB, 0x4D, 0xD1, 0x8B, 0x4D, 0x39, 0x88, 0x24, 0x96, 0x56, 0x42,

   EFI_FMP_DEP_GT,

   EFI_FMP_DEP_PUSH_VERSION, 0x03, 0x00, 0x00, 0x00,

-  EFI_FMP_DEP_PUSH_GUID, 0x70, 0x73, 0x2A, 0xA4, 0x3A, 0x43, 0x4D, 0x68, 0x9A, 0xA1, 0xDE, 0x62, 0x23, 0x30, 0x6C, 0xF3,

+  EFI_FMP_DEP_PUSH_GUID,    0x70, 0x73, 0x2A, 0xA4,0x3A,  0x43, 0x4D, 0x68, 0x9A, 0xA1, 0xDE, 0x62, 0x23, 0x30, 0x6C, 0xF3,

   EFI_FMP_DEP_GTE,

   EFI_FMP_DEP_AND,

   EFI_FMP_DEP_END

 };

 

 // Valid Dependency Expression 2: (Version(A) < 0x00000002) || (Version(B) <= 0x00000003)

-static UINT8 mExpression2[] = {

+static UINT8  mExpression2[] = {

   EFI_FMP_DEP_PUSH_VERSION, 0x02, 0x00, 0x00, 0x00,

-  EFI_FMP_DEP_PUSH_GUID, 0xFA, 0x4D, 0x14, 0x97, 0x8E, 0xEB, 0x4D, 0xD1, 0x8B, 0x4D, 0x39, 0x88, 0x24, 0x96, 0x56, 0x42,

+  EFI_FMP_DEP_PUSH_GUID,    0xFA, 0x4D, 0x14, 0x97,0x8E,  0xEB, 0x4D, 0xD1, 0x8B, 0x4D, 0x39, 0x88, 0x24, 0x96, 0x56, 0x42,

   EFI_FMP_DEP_LT,

   EFI_FMP_DEP_PUSH_VERSION, 0x03, 0x00, 0x00, 0x00,

-  EFI_FMP_DEP_PUSH_GUID, 0x70, 0x73, 0x2A, 0xA4, 0x3A, 0x43, 0x4D, 0x68, 0x9A, 0xA1, 0xDE, 0x62, 0x23, 0x30, 0x6C, 0xF3,

+  EFI_FMP_DEP_PUSH_GUID,    0x70, 0x73, 0x2A, 0xA4,0x3A,  0x43, 0x4D, 0x68, 0x9A, 0xA1, 0xDE, 0x62, 0x23, 0x30, 0x6C, 0xF3,

   EFI_FMP_DEP_LTE,

   EFI_FMP_DEP_OR,

   EFI_FMP_DEP_END

 };

 

 // Valid Dependency Expression 3: !(Version(A) == 0x0000002)

-static UINT8 mExpression3[] = {

+static UINT8  mExpression3[] = {

   EFI_FMP_DEP_PUSH_VERSION, 0x02, 0x00, 0x00, 0x00,

-  EFI_FMP_DEP_PUSH_GUID, 0xFA, 0x4D, 0x14, 0x97, 0x8E, 0xEB, 0x4D, 0xD1, 0x8B, 0x4D, 0x39, 0x88, 0x24, 0x96, 0x56, 0x42,

+  EFI_FMP_DEP_PUSH_GUID,    0xFA, 0x4D, 0x14, 0x97,0x8E,0xEB, 0x4D, 0xD1, 0x8B, 0x4D, 0x39, 0x88, 0x24, 0x96, 0x56, 0x42,

   EFI_FMP_DEP_EQ,

   EFI_FMP_DEP_NOT,

   EFI_FMP_DEP_END

 };

 

 // Valid Dependency Expression 4: "Test" TRUE && FALSE

-static UINT8 mExpression4[] = {

+static UINT8  mExpression4[] = {

   EFI_FMP_DEP_VERSION_STR, 'T', 'e', 's', 't', '\0',

   EFI_FMP_DEP_TRUE,

   EFI_FMP_DEP_FALSE,

@@ -86,58 +86,58 @@ static UINT8 mExpression4[] = {
 };

 

 // Invalid Dependency Expression 1: Invalid Op-code

-static UINT8 mExpression5[] = {EFI_FMP_DEP_TRUE, 0xAA, EFI_FMP_DEP_END};

+static UINT8  mExpression5[] = { EFI_FMP_DEP_TRUE, 0xAA, EFI_FMP_DEP_END };

 

 // Invalid Dependency Expression 2: String doesn't end with '\0'

-static UINT8 mExpression6[] = {EFI_FMP_DEP_VERSION_STR, 'T', 'e', 's', 't', EFI_FMP_DEP_TRUE, EFI_FMP_DEP_END};

+static UINT8  mExpression6[] = { EFI_FMP_DEP_VERSION_STR, 'T', 'e', 's', 't', EFI_FMP_DEP_TRUE, EFI_FMP_DEP_END };

 

 // Invalid Dependency Expression 3: GUID is in invalid size

-static UINT8 mExpression7[] = {

+static UINT8  mExpression7[] = {

   EFI_FMP_DEP_PUSH_VERSION, 0x02, 0x00, 0x00, 0x00,

-  EFI_FMP_DEP_PUSH_GUID, 0xAA, 0xBB, 0xCC, 0xDD,

+  EFI_FMP_DEP_PUSH_GUID,    0xAA, 0xBB, 0xCC, 0xDD,

   EFI_FMP_DEP_GTE,

   EFI_FMP_DEP_END

 };

 

 // Invalid Dependency Expression 4: Version is in invalid size

-static UINT8 mExpression8[] = {

+static UINT8  mExpression8[] = {

   EFI_FMP_DEP_PUSH_VERSION, 0x02, 0x00,

-  EFI_FMP_DEP_PUSH_GUID, 0xDA, 0xCB, 0x25, 0xAC, 0x9E, 0xCD, 0x5E, 0xE2, 0x9C, 0x5E, 0x4A, 0x99, 0x35, 0xA7, 0x67, 0x53,

+  EFI_FMP_DEP_PUSH_GUID,    0xDA, 0xCB,0x25,0xAC, 0x9E, 0xCD, 0x5E, 0xE2, 0x9C, 0x5E, 0x4A, 0x99, 0x35, 0xA7, 0x67, 0x53,

   EFI_FMP_DEP_GTE,

   EFI_FMP_DEP_END

 };

 

 // Invalid Dependency Expression 5: Operand and operator mismatch

-static UINT8 mExpression9[] = {EFI_FMP_DEP_TRUE, EFI_FMP_DEP_FALSE, EFI_FMP_DEP_GTE, EFI_FMP_DEP_END};

+static UINT8  mExpression9[] = { EFI_FMP_DEP_TRUE, EFI_FMP_DEP_FALSE, EFI_FMP_DEP_GTE, EFI_FMP_DEP_END };

 

 // Invalid Dependency Expression 6: GUID is NOT FOUND

-static UINT8 mExpression10[] = {

+static UINT8  mExpression10[] = {

   EFI_FMP_DEP_PUSH_VERSION, 0x02, 0x00, 0x00, 0x00,

-  EFI_FMP_DEP_PUSH_GUID, 0xDA, 0xCB, 0x25, 0xAC, 0x9E, 0xCD, 0x5E, 0xE2, 0x9C, 0x5E, 0x4A, 0x99, 0x35, 0xA7, 0x67, 0x53,

+  EFI_FMP_DEP_PUSH_GUID,    0xDA, 0xCB, 0x25, 0xAC,0x9E,0xCD, 0x5E, 0xE2, 0x9C, 0x5E, 0x4A, 0x99, 0x35, 0xA7, 0x67, 0x53,

   EFI_FMP_DEP_GT,

   EFI_FMP_DEP_END

 };

 

 // Invalid Dependency Expression 7: Stack underflow

-static UINT8 mExpression11[] = {

+static UINT8  mExpression11[] = {

   EFI_FMP_DEP_PUSH_VERSION, 0x02, 0x00, 0x00, 0x00,

   EFI_FMP_DEP_GT,

   EFI_FMP_DEP_END

 };

 

 // ------------------------------------------------Test Depex------Depex Size----------------Expected Result

-static BASIC_TEST_CONTEXT   mBasicTestTrue1      = {mExpression1,  sizeof(mExpression1),     TRUE};

-static BASIC_TEST_CONTEXT   mBasicTestTrue2      = {mExpression2,  sizeof(mExpression2),     TRUE};

-static BASIC_TEST_CONTEXT   mBasicTestFalse1     = {mExpression3,  sizeof(mExpression3),     FALSE};

-static BASIC_TEST_CONTEXT   mBasicTestFalse2     = {mExpression4,  sizeof(mExpression4),     FALSE};

-static BASIC_TEST_CONTEXT   mBasicTestInvalid1   = {mExpression1,  sizeof(mExpression1) - 1, FALSE};

-static BASIC_TEST_CONTEXT   mBasicTestInvalid2   = {mExpression5,  sizeof(mExpression5),     FALSE};

-static BASIC_TEST_CONTEXT   mBasicTestInvalid3   = {mExpression6,  sizeof(mExpression6),     FALSE};

-static BASIC_TEST_CONTEXT   mBasicTestInvalid4   = {mExpression7,  sizeof(mExpression7),     FALSE};

-static BASIC_TEST_CONTEXT   mBasicTestInvalid5   = {mExpression8,  sizeof(mExpression8),     FALSE};

-static BASIC_TEST_CONTEXT   mBasicTestInvalid6   = {mExpression9,  sizeof(mExpression9),     FALSE};

-static BASIC_TEST_CONTEXT   mBasicTestInvalid7   = {mExpression10, sizeof(mExpression10),    FALSE};

-static BASIC_TEST_CONTEXT   mBasicTestInvalid8   = {mExpression11, sizeof(mExpression11),    FALSE};

+static BASIC_TEST_CONTEXT  mBasicTestTrue1    = { mExpression1, sizeof (mExpression1), TRUE };

+static BASIC_TEST_CONTEXT  mBasicTestTrue2    = { mExpression2, sizeof (mExpression2), TRUE };

+static BASIC_TEST_CONTEXT  mBasicTestFalse1   = { mExpression3, sizeof (mExpression3), FALSE };

+static BASIC_TEST_CONTEXT  mBasicTestFalse2   = { mExpression4, sizeof (mExpression4), FALSE };

+static BASIC_TEST_CONTEXT  mBasicTestInvalid1 = { mExpression1, sizeof (mExpression1) - 1, FALSE };

+static BASIC_TEST_CONTEXT  mBasicTestInvalid2 = { mExpression5, sizeof (mExpression5), FALSE };

+static BASIC_TEST_CONTEXT  mBasicTestInvalid3 = { mExpression6, sizeof (mExpression6), FALSE };

+static BASIC_TEST_CONTEXT  mBasicTestInvalid4 = { mExpression7, sizeof (mExpression7), FALSE };

+static BASIC_TEST_CONTEXT  mBasicTestInvalid5 = { mExpression8, sizeof (mExpression8), FALSE };

+static BASIC_TEST_CONTEXT  mBasicTestInvalid6 = { mExpression9, sizeof (mExpression9), FALSE };

+static BASIC_TEST_CONTEXT  mBasicTestInvalid7 = { mExpression10, sizeof (mExpression10), FALSE };

+static BASIC_TEST_CONTEXT  mBasicTestInvalid8 = { mExpression11, sizeof (mExpression11), FALSE };

 

 /**

   Unit test for EvaluateDependency() API of the FmpDependencyLib.

@@ -171,7 +171,7 @@ EvaluateDependencyTest (
                        (EFI_FIRMWARE_IMAGE_DEP *)TestContext->Dependencies,

                        TestContext->DependenciesSize,

                        mFmpVersions,

-                       sizeof(mFmpVersions)/sizeof(FMP_DEPEX_CHECK_VERSION_DATA),

+                       sizeof (mFmpVersions)/sizeof (FMP_DEPEX_CHECK_VERSION_DATA),

                        &LastAttemptStatus

                        );

 

@@ -208,8 +208,8 @@ UnitTestingEntry (
   //

   Status = InitUnitTestFramework (&Fw, UNIT_TEST_APP_NAME, gEfiCallerBaseName, UNIT_TEST_APP_VERSION);

   if (EFI_ERROR (Status)) {

-      DEBUG ((DEBUG_ERROR, "Failed in InitUnitTestFramework. Status = %r\n", Status));

-      goto EXIT;

+    DEBUG ((DEBUG_ERROR, "Failed in InitUnitTestFramework. Status = %r\n", Status));

+    goto EXIT;

   }

 

   //

@@ -265,8 +265,8 @@ FmpDependencyLibUnitTestAppEntry (
 **/

 int

 main (

-  int argc,

-  char *argv[]

+  int   argc,

+  char  *argv[]

   )

 {

   return UnitTestingEntry ();