NetworkPkg: Apply uncrustify changes

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

Apply uncrustify changes to .c/.h files in the NetworkPkg 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: Maciej Rabeda <maciej.rabeda@linux.intel.com>

3 files changed, 89 insertions, 91 deletions

diff --git a/NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.c b/NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.c
index 4c1e44d24c..a3e1ea4691 100644
--- a/NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.c
+++ b/NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.c
@@ -9,7 +9,6 @@
 

 #include "HttpUtilitiesDxe.h"

 

-

 /**

   Unloads an image.

 

@@ -25,14 +24,13 @@ HttpUtilitiesDxeUnload (
   IN EFI_HANDLE  ImageHandle

   )

 {

-  EFI_STATUS                      Status;

-  UINTN                           HandleNum;

-  EFI_HANDLE                      *HandleBuffer;

-  UINT32                          Index;

-  EFI_HTTP_UTILITIES_PROTOCOL     *HttpUtilitiesProtocol;

-

+  EFI_STATUS                   Status;

+  UINTN                        HandleNum;

+  EFI_HANDLE                   *HandleBuffer;

+  UINT32                       Index;

+  EFI_HTTP_UTILITIES_PROTOCOL  *HttpUtilitiesProtocol;

 

-  HandleBuffer   = NULL;

+  HandleBuffer = NULL;

 

   //

   // Locate all the handles with HttpUtilities protocol.

@@ -55,7 +53,7 @@ HttpUtilitiesDxeUnload (
     Status = gBS->OpenProtocol (

                     HandleBuffer[Index],

                     &gEfiHttpUtilitiesProtocolGuid,

-                    (VOID **) &HttpUtilitiesProtocol,

+                    (VOID **)&HttpUtilitiesProtocol,

                     ImageHandle,

                     NULL,

                     EFI_OPEN_PROTOCOL_BY_HANDLE_PROTOCOL

@@ -69,7 +67,8 @@ HttpUtilitiesDxeUnload (
     //

     Status = gBS->UninstallMultipleProtocolInterfaces (

                     HandleBuffer[Index],

-                    &gEfiHttpUtilitiesProtocolGuid, HttpUtilitiesProtocol,

+                    &gEfiHttpUtilitiesProtocolGuid,

+                    HttpUtilitiesProtocol,

                     NULL

                     );

     if (EFI_ERROR (Status)) {

@@ -80,7 +79,6 @@ HttpUtilitiesDxeUnload (
   return EFI_SUCCESS;

 }

 

-

 /**

   This is the declaration of an EFI image entry point. This entry point is

   the same for UEFI Applications, UEFI OS Loaders, and UEFI Drivers including

@@ -99,9 +97,9 @@ HttpUtilitiesDxeDriverEntryPoint (
   IN EFI_SYSTEM_TABLE  *SystemTable

   )

 {

-  EFI_STATUS             Status;

+  EFI_STATUS  Status;

 

-  EFI_HANDLE             Handle;

+  EFI_HANDLE  Handle;

 

   Handle = NULL;

 

@@ -117,4 +115,3 @@ HttpUtilitiesDxeDriverEntryPoint (
 

   return Status;

 }

-

diff --git a/NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.h b/NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.h
index ce9895ded1..c9cf966c75 100644
--- a/NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.h
+++ b/NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.h
@@ -33,7 +33,7 @@
 //

 // Protocol instances

 //

-extern EFI_HTTP_UTILITIES_PROTOCOL mHttpUtilitiesProtocol;

+extern EFI_HTTP_UTILITIES_PROTOCOL  mHttpUtilitiesProtocol;

 

 /**

   Create HTTP header based on a combination of seed header, fields

@@ -70,18 +70,17 @@ extern EFI_HTTP_UTILITIES_PROTOCOL mHttpUtilitiesProtocol;
 EFI_STATUS

 EFIAPI

 HttpUtilitiesBuild (

-  IN     EFI_HTTP_UTILITIES_PROTOCOL *This,

-  IN     UINTN                       SeedMessageSize,

-  IN     VOID                        *SeedMessage  OPTIONAL,

-  IN     UINTN                       DeleteCount,

-  IN     CHAR8                       *DeleteList[]  OPTIONAL,

-  IN     UINTN                       AppendCount,

-  IN     EFI_HTTP_HEADER             *AppendList[]  OPTIONAL,

-     OUT UINTN                       *NewMessageSize,

-     OUT VOID                        **NewMessage

+  IN     EFI_HTTP_UTILITIES_PROTOCOL  *This,

+  IN     UINTN                        SeedMessageSize,

+  IN     VOID                         *SeedMessage  OPTIONAL,

+  IN     UINTN                        DeleteCount,

+  IN     CHAR8                        *DeleteList[]  OPTIONAL,

+  IN     UINTN                        AppendCount,

+  IN     EFI_HTTP_HEADER              *AppendList[]  OPTIONAL,

+  OUT UINTN                           *NewMessageSize,

+  OUT VOID                            **NewMessage

   );

 

-

 /**

   Parses HTTP header and produces an array of key/value pairs.

 

diff --git a/NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesProtocol.c b/NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesProtocol.c
index efa4091135..c7d43576ea 100644
--- a/NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesProtocol.c
+++ b/NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesProtocol.c
@@ -9,12 +9,11 @@
 

 #include "HttpUtilitiesDxe.h"

 

-EFI_HTTP_UTILITIES_PROTOCOL mHttpUtilitiesProtocol = {

+EFI_HTTP_UTILITIES_PROTOCOL  mHttpUtilitiesProtocol = {

   HttpUtilitiesBuild,

   HttpUtilitiesParse

 };

 

-

 /**

   Create HTTP header based on a combination of seed header, fields

   to delete, and fields to append.

@@ -50,28 +49,28 @@ EFI_HTTP_UTILITIES_PROTOCOL mHttpUtilitiesProtocol = {
 EFI_STATUS

 EFIAPI

 HttpUtilitiesBuild (

-  IN     EFI_HTTP_UTILITIES_PROTOCOL *This,

-  IN     UINTN                       SeedMessageSize,

-  IN     VOID                        *SeedMessage  OPTIONAL,

-  IN     UINTN                       DeleteCount,

-  IN     CHAR8                       *DeleteList[]  OPTIONAL,

-  IN     UINTN                       AppendCount,

-  IN     EFI_HTTP_HEADER             *AppendList[]  OPTIONAL,

-     OUT UINTN                       *NewMessageSize,

-     OUT VOID                        **NewMessage

+  IN     EFI_HTTP_UTILITIES_PROTOCOL  *This,

+  IN     UINTN                        SeedMessageSize,

+  IN     VOID                         *SeedMessage  OPTIONAL,

+  IN     UINTN                        DeleteCount,

+  IN     CHAR8                        *DeleteList[]  OPTIONAL,

+  IN     UINTN                        AppendCount,

+  IN     EFI_HTTP_HEADER              *AppendList[]  OPTIONAL,

+  OUT UINTN                           *NewMessageSize,

+  OUT VOID                            **NewMessage

   )

 {

-  EFI_STATUS                Status;

-  EFI_HTTP_HEADER           *SeedHeaderFields;

-  UINTN                     SeedFieldCount;

-  UINTN                     Index;

-  EFI_HTTP_HEADER           *TempHeaderFields;

-  UINTN                     TempFieldCount;

-  EFI_HTTP_HEADER           *NewHeaderFields;

-  UINTN                     NewFieldCount;

-  EFI_HTTP_HEADER           *HttpHeader;

-  UINTN                     StrLength;

-  UINT8                     *NewMessagePtr;

+  EFI_STATUS       Status;

+  EFI_HTTP_HEADER  *SeedHeaderFields;

+  UINTN            SeedFieldCount;

+  UINTN            Index;

+  EFI_HTTP_HEADER  *TempHeaderFields;

+  UINTN            TempFieldCount;

+  EFI_HTTP_HEADER  *NewHeaderFields;

+  UINTN            NewFieldCount;

+  EFI_HTTP_HEADER  *HttpHeader;

+  UINTN            StrLength;

+  UINT8            *NewMessagePtr;

 

   SeedHeaderFields = NULL;

   SeedFieldCount   = 0;

@@ -80,11 +79,11 @@ HttpUtilitiesBuild (
   NewHeaderFields  = NULL;

   NewFieldCount    = 0;

 

-  HttpHeader       = NULL;

-  StrLength        = 0;

-  NewMessagePtr    = NULL;

-  *NewMessageSize  = 0;

-  Status           = EFI_SUCCESS;

+  HttpHeader      = NULL;

+  StrLength       = 0;

+  NewMessagePtr   = NULL;

+  *NewMessageSize = 0;

+  Status          = EFI_SUCCESS;

 

   if (This == NULL) {

     return EFI_INVALID_PARAMETER;

@@ -106,8 +105,8 @@ HttpUtilitiesBuild (
   //

   // Handle DeleteList

   //

-  if (SeedFieldCount != 0 && DeleteCount != 0) {

-    TempHeaderFields = AllocateZeroPool (SeedFieldCount * sizeof(EFI_HTTP_HEADER));

+  if ((SeedFieldCount != 0) && (DeleteCount != 0)) {

+    TempHeaderFields = AllocateZeroPool (SeedFieldCount * sizeof (EFI_HTTP_HEADER));

     if (TempHeaderFields == NULL) {

       Status = EFI_OUT_OF_RESOURCES;

       goto ON_EXIT;

@@ -117,7 +116,7 @@ HttpUtilitiesBuild (
       //

       // Check whether each SeedHeaderFields member is in DeleteList

       //

-      if (HttpIsValidHttpHeader( DeleteList, DeleteCount, SeedHeaderFields[Index].FieldName)) {

+      if (HttpIsValidHttpHeader (DeleteList, DeleteCount, SeedHeaderFields[Index].FieldName)) {

         Status = HttpSetFieldNameAndValue (

                    &TempHeaderFields[TempFieldCount],

                    SeedHeaderFields[Index].FieldName,

@@ -126,12 +125,13 @@ HttpUtilitiesBuild (
         if (EFI_ERROR (Status)) {

           goto ON_EXIT;

         }

+

         TempFieldCount++;

       }

     }

   } else {

     TempHeaderFields = SeedHeaderFields;

-    TempFieldCount = SeedFieldCount;

+    TempFieldCount   = SeedFieldCount;

   }

 

   //

@@ -176,6 +176,7 @@ HttpUtilitiesBuild (
       if (EFI_ERROR (Status)) {

         goto ON_EXIT;

       }

+

       NewFieldCount++;

     }

   }

@@ -186,19 +187,20 @@ HttpUtilitiesBuild (
   for (Index = 0; Index < NewFieldCount; Index++) {

     HttpHeader = &NewHeaderFields[Index];

 

-    StrLength = AsciiStrLen (HttpHeader->FieldName);

+    StrLength        = AsciiStrLen (HttpHeader->FieldName);

     *NewMessageSize += StrLength;

 

-    StrLength = sizeof(": ") - 1;

+    StrLength        = sizeof (": ") - 1;

     *NewMessageSize += StrLength;

 

-    StrLength = AsciiStrLen (HttpHeader->FieldValue);

+    StrLength        = AsciiStrLen (HttpHeader->FieldValue);

     *NewMessageSize += StrLength;

 

-    StrLength = sizeof("\r\n") - 1;

+    StrLength        = sizeof ("\r\n") - 1;

     *NewMessageSize += StrLength;

   }

-  StrLength = sizeof("\r\n") - 1;

+

+  StrLength        = sizeof ("\r\n") - 1;

   *NewMessageSize += StrLength;

 

   *NewMessage = AllocateZeroPool (*NewMessageSize);

@@ -216,7 +218,7 @@ HttpUtilitiesBuild (
     CopyMem (NewMessagePtr, HttpHeader->FieldName, StrLength);

     NewMessagePtr += StrLength;

 

-    StrLength = sizeof(": ") - 1;

+    StrLength = sizeof (": ") - 1;

     CopyMem (NewMessagePtr, ": ", StrLength);

     NewMessagePtr += StrLength;

 

@@ -224,11 +226,12 @@ HttpUtilitiesBuild (
     CopyMem (NewMessagePtr, HttpHeader->FieldValue, StrLength);

     NewMessagePtr += StrLength;

 

-    StrLength = sizeof("\r\n") - 1;

+    StrLength = sizeof ("\r\n") - 1;

     CopyMem (NewMessagePtr, "\r\n", StrLength);

     NewMessagePtr += StrLength;

   }

-  StrLength = sizeof("\r\n") - 1;

+

+  StrLength = sizeof ("\r\n") - 1;

   CopyMem (NewMessagePtr, "\r\n", StrLength);

   NewMessagePtr += StrLength;

 

@@ -239,21 +242,20 @@ HttpUtilitiesBuild (
   //

 ON_EXIT:

   if (SeedHeaderFields != NULL) {

-    HttpFreeHeaderFields(SeedHeaderFields, SeedFieldCount);

+    HttpFreeHeaderFields (SeedHeaderFields, SeedFieldCount);

   }

 

   if (TempHeaderFields != NULL) {

-    HttpFreeHeaderFields(TempHeaderFields, TempFieldCount);

+    HttpFreeHeaderFields (TempHeaderFields, TempFieldCount);

   }

 

   if (NewHeaderFields != NULL) {

-    HttpFreeHeaderFields(NewHeaderFields, NewFieldCount);

+    HttpFreeHeaderFields (NewHeaderFields, NewFieldCount);

   }

 

   return Status;

 }

 

-

 /**

   Parses HTTP header and produces an array of key/value pairs.

 

@@ -285,14 +287,14 @@ HttpUtilitiesParse (
   OUT UINTN                        *FieldCount

   )

 {

-  EFI_STATUS                Status;

-  CHAR8                     *TempHttpMessage;

-  CHAR8                     *Token;

-  CHAR8                     *NextToken;

-  CHAR8                     *FieldName;

-  CHAR8                     *FieldValue;

-  UINTN                     Index;

-  UINTN                     HttpBufferSize;

+  EFI_STATUS  Status;

+  CHAR8       *TempHttpMessage;

+  CHAR8       *Token;

+  CHAR8       *NextToken;

+  CHAR8       *FieldName;

+  CHAR8       *FieldValue;

+  UINTN       Index;

+  UINTN       HttpBufferSize;

 

   Status          = EFI_SUCCESS;

   TempHttpMessage = NULL;

@@ -302,14 +304,14 @@ HttpUtilitiesParse (
   FieldValue      = NULL;

   Index           = 0;

 

-  if (This == NULL || HttpMessage == NULL || HeaderFields == NULL || FieldCount == NULL) {

+  if ((This == NULL) || (HttpMessage == NULL) || (HeaderFields == NULL) || (FieldCount == NULL)) {

     return EFI_INVALID_PARAMETER;

   }

 

   //

   // Append the http response string along with a Null-terminator.

   //

-  HttpBufferSize = HttpMessageSize + 1;

+  HttpBufferSize  = HttpMessageSize + 1;

   TempHttpMessage = AllocatePool (HttpBufferSize);

   if (TempHttpMessage == NULL) {

     return EFI_OUT_OF_RESOURCES;

@@ -322,13 +324,13 @@ HttpUtilitiesParse (
   // Get header number

   //

   *FieldCount = 0;

-  Token = TempHttpMessage;

+  Token       = TempHttpMessage;

   while (TRUE) {

-    FieldName     = NULL;

-    FieldValue    = NULL;

-    NextToken = HttpGetFieldNameAndValue (Token, &FieldName, &FieldValue);

-    Token     = NextToken;

-    if (FieldName == NULL || FieldValue == NULL) {

+    FieldName  = NULL;

+    FieldValue = NULL;

+    NextToken  = HttpGetFieldNameAndValue (Token, &FieldName, &FieldValue);

+    Token      = NextToken;

+    if ((FieldName == NULL) || (FieldValue == NULL)) {

       break;

     }

 

@@ -343,10 +345,10 @@ HttpUtilitiesParse (
   //

   // Allocate buffer for header

   //

-  *HeaderFields = AllocateZeroPool ((*FieldCount) * sizeof(EFI_HTTP_HEADER));

+  *HeaderFields = AllocateZeroPool ((*FieldCount) * sizeof (EFI_HTTP_HEADER));

   if (*HeaderFields == NULL) {

     *FieldCount = 0;

-    Status = EFI_OUT_OF_RESOURCES;

+    Status      = EFI_OUT_OF_RESOURCES;

     goto ON_EXIT;

   }

 

@@ -357,11 +359,11 @@ HttpUtilitiesParse (
   //

   Token = TempHttpMessage;

   while (Index < *FieldCount) {

-    FieldName     = NULL;

-    FieldValue    = NULL;

-    NextToken = HttpGetFieldNameAndValue (Token, &FieldName, &FieldValue);

-    Token     = NextToken;

-    if (FieldName == NULL || FieldValue == NULL) {

+    FieldName  = NULL;

+    FieldValue = NULL;

+    NextToken  = HttpGetFieldNameAndValue (Token, &FieldName, &FieldValue);

+    Token      = NextToken;

+    if ((FieldName == NULL) || (FieldValue == NULL)) {

       break;

     }