NetworkPkg/IpSecDxe: Add missing EFIAPI for callback functions

Callback functions must always use EFIAPI.

GCC 4.4 X64 flagged these mismatches in EFIAPI usage.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11221 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/NetworkPkg/IpSecDxe/IkePacket.c b/NetworkPkg/IpSecDxe/IkePacket.c
index fa29d548768d2e02911f5039f480be2702449c14..8fd395d43fa581c37e9ed91675b4a686107abe7a 100644 (file)
--- a/NetworkPkg/IpSecDxe/IkePacket.c
+++ b/NetworkPkg/IpSecDxe/IkePacket.c
@@ -99,6 +99,7 @@ IkePacketFree (
 \r
 **/\r
 VOID\r
+EFIAPI\r
 IkePacketNetbufFree (\r
   IN VOID  *Arg\r
   )\r

diff --git a/NetworkPkg/IpSecDxe/IkeService.c b/NetworkPkg/IpSecDxe/IkeService.c
index 0550534f9cce1641fb271a80e32a4cd941b8b1cd..0b2d212d683254d1cb2763ec66faf2a3ad07bc4a 100644 (file)
--- a/NetworkPkg/IpSecDxe/IkeService.c
+++ b/NetworkPkg/IpSecDxe/IkeService.c
@@ -116,6 +116,7 @@ IkeLookupUdp (
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 IkeConfigUdp4 (\r
   IN UDP_IO                 *UdpIo,\r
   IN VOID                   *Context\r
@@ -157,6 +158,7 @@ IkeConfigUdp4 (
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 IkeConfigUdp6 (\r
   IN UDP_IO                 *UdpIo,\r
   IN VOID                   *Context\r
@@ -573,6 +575,7 @@ IkeNegotiate (
     \r
 **/\r
 VOID\r
+EFIAPI\r
 IkeDispatch (\r
   IN NET_BUF                        *Packet,\r
   IN UDP_END_POINT                  *EndPoint,\r

diff --git a/NetworkPkg/IpSecDxe/IkeService.h b/NetworkPkg/IpSecDxe/IkeService.h
index cbd58cc08042bae365437de4a8c401e9ec62ad82..232ecf3d96953eed6d1288d1f90c1d413b758d5d 100644 (file)
--- a/NetworkPkg/IpSecDxe/IkeService.h
+++ b/NetworkPkg/IpSecDxe/IkeService.h
@@ -207,6 +207,7 @@ IkeNegotiate (
     \r
 **/\r
 VOID\r
+EFIAPI\r
 IkeDispatch (\r
   IN NET_BUF                        *Packet,\r
   IN UDP_END_POINT                  *EndPoint,\r

diff --git a/NetworkPkg/IpSecDxe/Ikev2/Payload.c b/NetworkPkg/IpSecDxe/Ikev2/Payload.c
index 35bebf7e437a97ec4a86ea443e6b5d01358190d4..0b836173894d14bf3217a98b2ac3cb8175b09446 100644 (file)
--- a/NetworkPkg/IpSecDxe/Ikev2/Payload.c
+++ b/NetworkPkg/IpSecDxe/Ikev2/Payload.c
@@ -3015,6 +3015,7 @@ Ikev2OnPacketAccepted (
 \r
 **/\r
 VOID\r
+EFIAPI\r
 Ikev2OnPacketSent (\r
   IN NET_BUF                   *Packet,\r
   IN UDP_END_POINT             *EndPoint,\r
@@ -3050,7 +3051,7 @@ Ikev2OnPacketSent (
       IkePacketFree (IkePacket);\r
       return;\r
     }\r
-
+\r
     Private = IkePacket->Private;\r
     if (IkePacket->Spi != 0 ) {\r
       //\r
@@ -3088,7 +3089,7 @@ Ikev2OnPacketSent (
         IkeSaSession->InitiatorCookie,\r
         IkeSaSession->ResponderCookie)\r
         );\r
-
+\r
       RemoveEntryList (&IkeSaSession->BySessionTable);\r
       Ikev2SaSessionFree (IkeSaSession);\r
     }\r
@@ -3100,27 +3101,27 @@ Ikev2OnPacketSent (
   // should be changed.\r
   //\r
   if (Private != NULL && Private->IsIPsecDisabling) {\r
-    //
-    // After all IKE SAs were deleted, set the IPSEC_STATUS_DISABLED value in
-    // IPsec status variable.
-    //
+    //\r
+    // After all IKE SAs were deleted, set the IPSEC_STATUS_DISABLED value in\r
+    // IPsec status variable.\r
+    //\r
     if (IsListEmpty (&Private->Ikev1EstablishedList) && IsListEmpty (&Private->Ikev2EstablishedList)) {\r
-      Value = IPSEC_STATUS_DISABLED;
-      Status = gRT->SetVariable (
-                 IPSECCONFIG_STATUS_NAME,
-                 &gEfiIpSecConfigProtocolGuid,
-                 EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_NON_VOLATILE,
-                 sizeof (Value),
-                 &Value
-                 );
-      if (!EFI_ERROR (Status)) {
-        //
-        // Set the DisabledFlag in Private data.
-        //
-        Private->IpSec.DisabledFlag = TRUE;
-        Private->IsIPsecDisabling   = FALSE;
-      }
-    }
+      Value = IPSEC_STATUS_DISABLED;\r
+      Status = gRT->SetVariable (\r
+                 IPSECCONFIG_STATUS_NAME,\r
+                 &gEfiIpSecConfigProtocolGuid,\r
+                 EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_NON_VOLATILE,\r
+                 sizeof (Value),\r
+                 &Value\r
+                 );\r
+      if (!EFI_ERROR (Status)) {\r
+        //\r
+        // Set the DisabledFlag in Private data.\r
+        //\r
+        Private->IpSec.DisabledFlag = TRUE;\r
+        Private->IsIPsecDisabling   = FALSE;\r
+      }\r
+    }\r
   }\r
 }\r
 \r