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>

1 files changed, 77 insertions, 81 deletions

diff --git a/NetworkPkg/Ip4Dxe/Ip4Driver.c b/NetworkPkg/Ip4Dxe/Ip4Driver.c
index 7fed659ca1..ec483ff01f 100644
--- a/NetworkPkg/Ip4Dxe/Ip4Driver.c
+++ b/NetworkPkg/Ip4Dxe/Ip4Driver.c
@@ -10,7 +10,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 

 #include "Ip4Impl.h"

 

-EFI_DRIVER_BINDING_PROTOCOL gIp4DriverBinding = {

+EFI_DRIVER_BINDING_PROTOCOL  gIp4DriverBinding = {

   Ip4DriverBindingSupported,

   Ip4DriverBindingStart,

   Ip4DriverBindingStop,

@@ -35,13 +35,14 @@ IpSec2InstalledCallback (
   IN VOID       *Context

   )

 {

-  EFI_STATUS    Status;

+  EFI_STATUS  Status;

+

   //

   // Test if protocol was even found.

   // Notification function will be called at least once.

   //

   Status = gBS->LocateProtocol (&gEfiIpSec2ProtocolGuid, NULL, (VOID **)&mIpSec);

-  if (Status == EFI_SUCCESS && mIpSec != NULL) {

+  if ((Status == EFI_SUCCESS) && (mIpSec != NULL)) {

     //

     // Close the event so it does not get called again.

     //

@@ -69,11 +70,11 @@ IpSec2InstalledCallback (
 EFI_STATUS

 EFIAPI

 Ip4DriverEntryPoint (

-  IN EFI_HANDLE             ImageHandle,

-  IN EFI_SYSTEM_TABLE       *SystemTable

+  IN EFI_HANDLE        ImageHandle,

+  IN EFI_SYSTEM_TABLE  *SystemTable

   )

 {

-  VOID            *Registration;

+  VOID  *Registration;

 

   EfiCreateProtocolNotifyEvent (

     &gEfiIpSec2ProtocolGuid,

@@ -114,12 +115,12 @@ Ip4DriverEntryPoint (
 EFI_STATUS

 EFIAPI

 Ip4DriverBindingSupported (

-  IN EFI_DRIVER_BINDING_PROTOCOL  * This,

+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,

   IN EFI_HANDLE                   ControllerHandle,

-  IN EFI_DEVICE_PATH_PROTOCOL     * RemainingDevicePath OPTIONAL

+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath OPTIONAL

   )

 {

-  EFI_STATUS                Status;

+  EFI_STATUS  Status;

 

   //

   // Test for the MNP service binding Protocol

@@ -167,10 +168,9 @@ Ip4DriverBindingSupported (
 **/

 EFI_STATUS

 Ip4CleanService (

-  IN IP4_SERVICE            *IpSb

+  IN IP4_SERVICE  *IpSb

   );

 

-

 /**

   Create a new IP4 driver service binding private instance.

 

@@ -187,13 +187,13 @@ Ip4CleanService (
 **/

 EFI_STATUS

 Ip4CreateService (

-  IN  EFI_HANDLE            Controller,

-  IN  EFI_HANDLE            ImageHandle,

-  OUT IP4_SERVICE           **Service

+  IN  EFI_HANDLE   Controller,

+  IN  EFI_HANDLE   ImageHandle,

+  OUT IP4_SERVICE  **Service

   )

 {

-  IP4_SERVICE               *IpSb;

-  EFI_STATUS                Status;

+  IP4_SERVICE  *IpSb;

+  EFI_STATUS   Status;

 

   ASSERT (Service != NULL);

 

@@ -215,23 +215,23 @@ Ip4CreateService (
   IpSb->ServiceBinding.DestroyChild = Ip4ServiceBindingDestroyChild;

   IpSb->State                       = IP4_SERVICE_UNSTARTED;

 

-  IpSb->NumChildren                 = 0;

+  IpSb->NumChildren = 0;

   InitializeListHead (&IpSb->Children);

 

   InitializeListHead (&IpSb->Interfaces);

-  IpSb->DefaultInterface            = NULL;

-  IpSb->DefaultRouteTable           = NULL;

+  IpSb->DefaultInterface  = NULL;

+  IpSb->DefaultRouteTable = NULL;

 

   Ip4InitAssembleTable (&IpSb->Assemble);

 

-  IpSb->IgmpCtrl.Igmpv1QuerySeen    = 0;

+  IpSb->IgmpCtrl.Igmpv1QuerySeen = 0;

   InitializeListHead (&IpSb->IgmpCtrl.Groups);

 

-  IpSb->Image                       = ImageHandle;

-  IpSb->Controller                  = Controller;

+  IpSb->Image      = ImageHandle;

+  IpSb->Controller = Controller;

 

-  IpSb->MnpChildHandle              = NULL;

-  IpSb->Mnp                         = NULL;

+  IpSb->MnpChildHandle = NULL;

+  IpSb->Mnp            = NULL;

 

   IpSb->MnpConfigData.ReceivedQueueTimeoutValue = 0;

   IpSb->MnpConfigData.TransmitQueueTimeoutValue = 0;

@@ -246,7 +246,7 @@ Ip4CreateService (
 

   ZeroMem (&IpSb->SnpMode, sizeof (EFI_SIMPLE_NETWORK_MODE));

 

-  IpSb->Timer = NULL;

+  IpSb->Timer              = NULL;

   IpSb->ReconfigCheckTimer = NULL;

 

   IpSb->ReconfigEvent = NULL;

@@ -316,7 +316,7 @@ Ip4CreateService (
   Status = gBS->OpenProtocol (

                   IpSb->MnpChildHandle,

                   &gEfiManagedNetworkProtocolGuid,

-                  (VOID **) &IpSb->Mnp,

+                  (VOID **)&IpSb->Mnp,

                   ImageHandle,

                   Controller,

                   EFI_OPEN_PROTOCOL_BY_DRIVER

@@ -345,7 +345,7 @@ Ip4CreateService (
   }

 

   IpSb->MacString = NULL;

-  Status = NetLibGetMacString (IpSb->Controller, IpSb->Image, &IpSb->MacString);

+  Status          = NetLibGetMacString (IpSb->Controller, IpSb->Image, &IpSb->MacString);

 

   if (EFI_ERROR (Status)) {

     goto ON_ERROR;

@@ -375,8 +375,9 @@ Ip4CreateService (
     //

     IpSb->MaxPacketSize -= NET_VLAN_TAG_LEN;

   }

+

   IpSb->OldMaxPacketSize = IpSb->MaxPacketSize;

-  *Service = IpSb;

+  *Service               = IpSb;

 

   return EFI_SUCCESS;

 

@@ -387,7 +388,6 @@ ON_ERROR:
   return Status;

 }

 

-

 /**

   Clean up a IP4 service binding instance. It will release all

   the resource allocated by the instance. The instance may be

@@ -403,12 +403,12 @@ ON_ERROR:
 **/

 EFI_STATUS

 Ip4CleanService (

-  IN IP4_SERVICE            *IpSb

+  IN IP4_SERVICE  *IpSb

   )

 {

-  EFI_STATUS                Status;

+  EFI_STATUS  Status;

 

-  IpSb->State     = IP4_SERVICE_DESTROY;

+  IpSb->State = IP4_SERVICE_DESTROY;

 

   if (IpSb->Timer != NULL) {

     gBS->SetTimer (IpSb->Timer, TimerCancel, 0);

@@ -493,8 +493,8 @@ Ip4CleanService (
 EFI_STATUS

 EFIAPI

 Ip4DestroyChildEntryInHandleBuffer (

-  IN LIST_ENTRY         *Entry,

-  IN VOID               *Context

+  IN LIST_ENTRY  *Entry,

+  IN VOID        *Context

   )

 {

   IP4_PROTOCOL                  *IpInstance;

@@ -502,14 +502,14 @@ Ip4DestroyChildEntryInHandleBuffer (
   UINTN                         NumberOfChildren;

   EFI_HANDLE                    *ChildHandleBuffer;

 

-  if (Entry == NULL || Context == NULL) {

+  if ((Entry == NULL) || (Context == NULL)) {

     return EFI_INVALID_PARAMETER;

   }

 

-  IpInstance = NET_LIST_USER_STRUCT_S (Entry, IP4_PROTOCOL, Link, IP4_PROTOCOL_SIGNATURE);

-  ServiceBinding    = ((IP4_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *) Context)->ServiceBinding;

-  NumberOfChildren  = ((IP4_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *) Context)->NumberOfChildren;

-  ChildHandleBuffer = ((IP4_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *) Context)->ChildHandleBuffer;

+  IpInstance        = NET_LIST_USER_STRUCT_S (Entry, IP4_PROTOCOL, Link, IP4_PROTOCOL_SIGNATURE);

+  ServiceBinding    = ((IP4_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *)Context)->ServiceBinding;

+  NumberOfChildren  = ((IP4_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *)Context)->NumberOfChildren;

+  ChildHandleBuffer = ((IP4_DESTROY_CHILD_IN_HANDLE_BUF_CONTEXT *)Context)->ChildHandleBuffer;

 

   if (!NetIsInHandleBuffer (IpInstance->Handle, NumberOfChildren, ChildHandleBuffer)) {

     return EFI_SUCCESS;

@@ -544,11 +544,11 @@ Ip4DriverBindingStart (
   IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath OPTIONAL

   )

 {

-  EFI_STATUS                    Status;

-  IP4_SERVICE                   *IpSb;

-  EFI_IP4_CONFIG2_PROTOCOL      *Ip4Cfg2;

-  UINTN                         Index;

-  IP4_CONFIG2_DATA_ITEM         *DataItem;

+  EFI_STATUS                Status;

+  IP4_SERVICE               *IpSb;

+  EFI_IP4_CONFIG2_PROTOCOL  *Ip4Cfg2;

+  UINTN                     Index;

+  IP4_CONFIG2_DATA_ITEM     *DataItem;

 

   IpSb     = NULL;

   Ip4Cfg2  = NULL;

@@ -578,7 +578,7 @@ Ip4DriverBindingStart (
 

   ASSERT (IpSb != NULL);

 

-  Ip4Cfg2  = &IpSb->Ip4Config2Instance.Ip4Config2;

+  Ip4Cfg2 = &IpSb->Ip4Config2Instance.Ip4Config2;

 

   //

   // Install the Ip4ServiceBinding Protocol onto ControllerHandle

@@ -617,11 +617,11 @@ Ip4DriverBindingStart (
                           DataItem->DataSize,

                           DataItem->Data.Ptr

                           );

-      if (EFI_ERROR(Status)) {

+      if (EFI_ERROR (Status)) {

         goto UNINSTALL_PROTOCOL;

       }

 

-      if (Index == Ip4Config2DataTypePolicy && (*(DataItem->Data.Policy) == Ip4Config2PolicyDhcp)) {

+      if ((Index == Ip4Config2DataTypePolicy) && (*(DataItem->Data.Policy) == Ip4Config2PolicyDhcp)) {

         break;

       }

     }

@@ -634,7 +634,7 @@ Ip4DriverBindingStart (
   //

   Status = Ip4ReceiveFrame (IpSb->DefaultInterface, NULL, Ip4AccpetFrame, IpSb);

 

-  if (EFI_ERROR (Status) && Status != EFI_ALREADY_STARTED) {

+  if (EFI_ERROR (Status) && (Status != EFI_ALREADY_STARTED)) {

     goto UNINSTALL_PROTOCOL;

   }

 

@@ -673,7 +673,6 @@ FREE_SERVICE:
   return Status;

 }

 

-

 /**

   Stop this driver on ControllerHandle. This service is called by the

   EFI boot service DisconnectController(). In order to

@@ -711,9 +710,9 @@ Ip4DriverBindingStop (
   IP4_INTERFACE                            *IpIf;

   IP4_ROUTE_TABLE                          *RouteTable;

 

-  BOOLEAN                                  IsDhcp4;

+  BOOLEAN  IsDhcp4;

 

-  IsDhcp4   = FALSE;

+  IsDhcp4 = FALSE;

 

   NicHandle = NetLibGetNicHandle (ControllerHandle, &gEfiManagedNetworkProtocolGuid);

   if (NicHandle == NULL) {

@@ -731,7 +730,7 @@ Ip4DriverBindingStop (
   Status = gBS->OpenProtocol (

                   NicHandle,

                   &gEfiIp4ServiceBindingProtocolGuid,

-                  (VOID **) &ServiceBinding,

+                  (VOID **)&ServiceBinding,

                   This->DriverBindingHandle,

                   NicHandle,

                   EFI_OPEN_PROTOCOL_GET_PROTOCOL

@@ -747,18 +746,17 @@ Ip4DriverBindingStop (
     gBS->CloseEvent (IpSb->Ip4Config2Instance.Dhcp4Event);

     IpSb->Ip4Config2Instance.Dhcp4Event = NULL;

   } else if (NumberOfChildren != 0) {

-    List = &IpSb->Children;

+    List                      = &IpSb->Children;

     Context.ServiceBinding    = ServiceBinding;

     Context.NumberOfChildren  = NumberOfChildren;

     Context.ChildHandleBuffer = ChildHandleBuffer;

-    Status = NetDestroyLinkList (

-               List,

-               Ip4DestroyChildEntryInHandleBuffer,

-               &Context,

-               NULL

-               );

+    Status                    = NetDestroyLinkList (

+                                  List,

+                                  Ip4DestroyChildEntryInHandleBuffer,

+                                  &Context,

+                                  NULL

+                                  );

   } else if (IpSb->DefaultInterface->ArpHandle == ControllerHandle) {

-

     //

     // The ARP protocol for the default interface is being uninstalled and all

     // its IP child handles should have been destroyed before. So, release the

@@ -772,21 +770,21 @@ Ip4DriverBindingStop (
     if (IpIf == NULL) {

       goto ON_ERROR;

     }

+

     RouteTable = Ip4CreateRouteTable ();

     if (RouteTable == NULL) {

       Ip4FreeInterface (IpIf, NULL);

-      goto ON_ERROR;;

+      goto ON_ERROR;

     }

 

-    IpSb->DefaultInterface  = IpIf;

+    IpSb->DefaultInterface = IpIf;

     InsertHeadList (&IpSb->Interfaces, &IpIf->Link);

     IpSb->DefaultRouteTable = RouteTable;

     Ip4ReceiveFrame (IpIf, NULL, Ip4AccpetFrame, IpSb);

 

     IpSb->State = IP4_SERVICE_UNSTARTED;

-

   } else if (IsListEmpty (&IpSb->Children)) {

-    State           = IpSb->State;

+    State = IpSb->State;

     //

     // OK, clean other resources then uninstall the service binding protocol.

     //

@@ -809,6 +807,7 @@ Ip4DriverBindingStop (
       FreeUnicodeStringTable (gIp4ControllerNameTable);

       gIp4ControllerNameTable = NULL;

     }

+

     FreePool (IpSb);

   }

 

@@ -816,7 +815,6 @@ ON_ERROR:
   return Status;

 }

 

-

 /**

   Creates a child handle and installs a protocol.

 

@@ -843,11 +841,11 @@ Ip4ServiceBindingCreateChild (
   IN OUT EFI_HANDLE                *ChildHandle

   )

 {

-  IP4_SERVICE               *IpSb;

-  IP4_PROTOCOL              *IpInstance;

-  EFI_TPL                   OldTpl;

-  EFI_STATUS                Status;

-  VOID                      *Mnp;

+  IP4_SERVICE   *IpSb;

+  IP4_PROTOCOL  *IpInstance;

+  EFI_TPL       OldTpl;

+  EFI_STATUS    Status;

+  VOID          *Mnp;

 

   if ((This == NULL) || (ChildHandle == NULL)) {

     return EFI_INVALID_PARAMETER;

@@ -884,7 +882,7 @@ Ip4ServiceBindingCreateChild (
   Status = gBS->OpenProtocol (

                   IpSb->MnpChildHandle,

                   &gEfiManagedNetworkProtocolGuid,

-                  (VOID **) &Mnp,

+                  (VOID **)&Mnp,

                   gIp4DriverBinding.DriverBindingHandle,

                   IpInstance->Handle,

                   EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER

@@ -913,7 +911,6 @@ Ip4ServiceBindingCreateChild (
 ON_ERROR:

 

   if (EFI_ERROR (Status)) {

-

     Ip4CleanProtocol (IpInstance);

 

     FreePool (IpInstance);

@@ -922,7 +919,6 @@ ON_ERROR:
   return Status;

 }

 

-

 /**

   Destroys a child handle with a protocol installed on it.

 

@@ -948,11 +944,11 @@ Ip4ServiceBindingDestroyChild (
   IN EFI_HANDLE                    ChildHandle

   )

 {

-  EFI_STATUS                Status;

-  IP4_SERVICE               *IpSb;

-  IP4_PROTOCOL              *IpInstance;

-  EFI_IP4_PROTOCOL          *Ip4;

-  EFI_TPL                   OldTpl;

+  EFI_STATUS        Status;

+  IP4_SERVICE       *IpSb;

+  IP4_PROTOCOL      *IpInstance;

+  EFI_IP4_PROTOCOL  *Ip4;

+  EFI_TPL           OldTpl;

 

   if ((This == NULL) || (ChildHandle == NULL)) {

     return EFI_INVALID_PARAMETER;

@@ -961,12 +957,12 @@ Ip4ServiceBindingDestroyChild (
   //

   // Retrieve the private context data structures

   //

-  IpSb   = IP4_SERVICE_FROM_PROTOCOL (This);

+  IpSb = IP4_SERVICE_FROM_PROTOCOL (This);

 

   Status = gBS->OpenProtocol (

                   ChildHandle,

                   &gEfiIp4ProtocolGuid,

-                  (VOID **) &Ip4,

+                  (VOID **)&Ip4,

                   gIp4DriverBinding.DriverBindingHandle,

                   ChildHandle,

                   EFI_OPEN_PROTOCOL_GET_PROTOCOL

@@ -1007,7 +1003,7 @@ Ip4ServiceBindingDestroyChild (
          ChildHandle

          );

 

-  if (IpInstance->Interface != NULL && IpInstance->Interface->Arp != NULL) {

+  if ((IpInstance->Interface != NULL) && (IpInstance->Interface->Arp != NULL)) {

     gBS->CloseProtocol (

            IpInstance->Interface->ArpHandle,

            &gEfiArpProtocolGuid,