Fix GCC build fail issue for MdeModulePkg and NetworkPkg.
authorsfu5 <sfu5@6f19259b-4bc3-4df7-8a09-765794883524>
Mon, 17 Dec 2012 06:48:35 +0000 (06:48 +0000)
committersfu5 <sfu5@6f19259b-4bc3-4df7-8a09-765794883524>
Mon, 17 Dec 2012 06:48:35 +0000 (06:48 +0000)
Signed-off-by: Fu Siyuan <siyuan.fu@intel.com>
Reviewed-by: Ye Ting <ting.ye@intel.com>
Reviewed-by: Ouyang Qian <qian.ouyang@intel.com>
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@14007 6f19259b-4bc3-4df7-8a09-765794883524

17 files changed:
MdeModulePkg/Include/Library/NetLib.h
MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
MdeModulePkg/Universal/Network/ArpDxe/ArpDriver.c
MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.c
MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.c
MdeModulePkg/Universal/Network/MnpDxe/MnpConfig.c
MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.c
MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.c
MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.h
MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.c
MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Driver.c
NetworkPkg/Dhcp6Dxe/Dhcp6Driver.c
NetworkPkg/Ip6Dxe/Ip6Common.c
NetworkPkg/Ip6Dxe/Ip6Driver.c
NetworkPkg/Mtftp6Dxe/Mtftp6Driver.c
NetworkPkg/TcpDxe/TcpDriver.c
NetworkPkg/Udp6Dxe/Udp6Driver.c

index d85c259..7ad8dac 100644 (file)
@@ -677,7 +677,7 @@ EFI_STATUS
 (EFIAPI *NET_DESTROY_LINK_LIST_CALLBACK) (\r
   IN LIST_ENTRY         *Entry,\r
   IN VOID               *Context   OPTIONAL\r
-);\r
+  );\r
 \r
 /**\r
   Safe destroy nodes in a linked list, and return the length of the list after all possible operations finished.\r
@@ -708,7 +708,7 @@ NetDestroyLinkList (
   IN   NET_DESTROY_LINK_LIST_CALLBACK   CallBack,\r
   IN   VOID                             *Context,    OPTIONAL\r
   OUT  UINTN                            *ListLength  OPTIONAL\r
-);\r
+  );\r
 \r
 /**\r
   This function checks the input Handle to see if it's one of these handles in ChildHandleBuffer.\r
@@ -723,11 +723,12 @@ NetDestroyLinkList (
 \r
 **/\r
 BOOLEAN\r
+EFIAPI\r
 NetIsInHandleBuffer (\r
   IN  EFI_HANDLE          Handle,\r
   IN  UINTN               NumberOfChildren,\r
   IN  EFI_HANDLE          *ChildHandleBuffer OPTIONAL\r
-);\r
+  );\r
 \r
 //\r
 // Object container: EFI network stack spec defines various kinds of\r
index 174c3c8..50e40c8 100644 (file)
@@ -1095,7 +1095,7 @@ NetDestroyLinkList (
   IN   NET_DESTROY_LINK_LIST_CALLBACK   CallBack,\r
   IN   VOID                             *Context,    OPTIONAL\r
   OUT  UINTN                            *ListLength  OPTIONAL\r
-)\r
+  )\r
 {\r
   UINTN                         PreviousLength;\r
   LIST_ENTRY                    *Entry;\r
@@ -1158,7 +1158,7 @@ NetIsInHandleBuffer (
   IN  EFI_HANDLE          Handle,\r
   IN  UINTN               NumberOfChildren,\r
   IN  EFI_HANDLE          *ChildHandleBuffer OPTIONAL\r
-)\r
+  )\r
 {\r
   UINTN     Index;\r
   \r
index 8914ebf..81ddd62 100644 (file)
@@ -252,10 +252,11 @@ ArpCleanService (
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 ArpDestroyChildEntryInHandleBuffer (\r
   IN LIST_ENTRY         *Entry,\r
   IN VOID               *Context\r
-)\r
+  )\r
 {\r
   ARP_INSTANCE_DATA             *Instance;\r
   EFI_SERVICE_BINDING_PROTOCOL  *ServiceBinding;\r
index 20758d3..d1bba30 100644 (file)
@@ -364,10 +364,11 @@ ON_ERROR:
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 Dhcp4DestroyChildEntry (\r
   IN LIST_ENTRY         *Entry,\r
   IN VOID               *Context\r
-)\r
+  )\r
 {\r
   DHCP_PROTOCOL                    *Instance;\r
   EFI_SERVICE_BINDING_PROTOCOL     *ServiceBinding;\r
index 5a84837..4a3d342 100644 (file)
@@ -406,10 +406,11 @@ Ip4CleanService (
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 Ip4DestroyChildEntryInHandleBuffer (\r
   IN LIST_ENTRY         *Entry,\r
   IN VOID               *Context\r
-)\r
+  )\r
 {\r
   IP4_PROTOCOL                  *IpInstance;\r
   EFI_SERVICE_BINDING_PROTOCOL  *ServiceBinding;\r
index 9586db7..046d4df 100644 (file)
@@ -696,10 +696,11 @@ MnpDestroyServiceData (
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 MnpDestoryChildEntry (\r
   IN LIST_ENTRY         *Entry,\r
   IN VOID               *Context\r
-)\r
+  )\r
 {\r
   MNP_INSTANCE_DATA             *Instance;\r
   EFI_SERVICE_BINDING_PROTOCOL  *ServiceBinding;\r
index 84c618c..2ddcec8 100644 (file)
@@ -37,10 +37,11 @@ EFI_DRIVER_BINDING_PROTOCOL gMnpDriverBinding = {
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 MnpDestroyServiceDataEntry (\r
   IN LIST_ENTRY         *Entry,\r
   IN VOID               *Context\r
-)\r
+  )\r
 {\r
   MNP_SERVICE_DATA              *MnpServiceData;\r
   \r
@@ -59,10 +60,11 @@ MnpDestroyServiceDataEntry (
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 MnpDestroyServiceChildEntry (\r
   IN LIST_ENTRY         *Entry,\r
   IN VOID               *Context\r
-)\r
+  )\r
 {\r
   MNP_SERVICE_DATA              *MnpServiceData;\r
 \r
index 8da47fc..a23d405 100644 (file)
@@ -328,10 +328,11 @@ ON_ERROR:
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 Mtftp4DestroyChildEntryInHandleBuffer (\r
   IN LIST_ENTRY         *Entry,\r
   IN VOID               *Context\r
-)\r
+  )\r
 {\r
   MTFTP4_PROTOCOL               *Instance;\r
   EFI_SERVICE_BINDING_PROTOCOL  *ServiceBinding;\r
index 329c6d8..527fd1d 100644 (file)
@@ -34,7 +34,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/MemoryAllocationLib.h>\r
 #include <Library/UefiBootServicesTableLib.h>\r
 #include <Library/UdpIoLib.h>\r
-#include <LIbrary/PrintLib.h>\r
+#include <Library/PrintLib.h>\r
 \r
 extern EFI_MTFTP4_PROTOCOL  gMtftp4ProtocolTemplate;\r
 \r
index 1021252..76eac72 100644 (file)
@@ -147,10 +147,11 @@ Tcp4DestroyTimer (
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 Tcp4DestroyChildEntryInHandleBuffer (\r
   IN LIST_ENTRY         *Entry,\r
   IN VOID               *Context\r
-)\r
+  )\r
 {\r
   SOCKET                        *Sock;\r
   EFI_SERVICE_BINDING_PROTOCOL  *ServiceBinding;\r
index 96b08d1..34e15da 100644 (file)
@@ -39,10 +39,11 @@ EFI_SERVICE_BINDING_PROTOCOL mUdp4ServiceBinding = {
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 Udp4DestroyChildEntryInHandleBuffer (\r
   IN LIST_ENTRY         *Entry,\r
   IN VOID               *Context\r
-)\r
+  )\r
 {\r
   UDP4_INSTANCE_DATA            *Instance;\r
   EFI_SERVICE_BINDING_PROTOCOL  *ServiceBinding;\r
index 42caefb..de53a1a 100644 (file)
@@ -337,10 +337,11 @@ Dhcp6CreateInstance (
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 Dhcp6DestroyChildEntry (\r
   IN LIST_ENTRY         *Entry,\r
   IN VOID               *Context\r
-)\r
+  )\r
 {\r
   DHCP6_INSTANCE                   *Instance;\r
   EFI_SERVICE_BINDING_PROTOCOL     *ServiceBinding;\r
index 459acd2..18ec012 100644 (file)
@@ -339,10 +339,11 @@ Ip6AddAddr (
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 Ip6DestroyChildEntryByAddr (\r
   IN LIST_ENTRY         *Entry,\r
   IN VOID               *Context\r
-)\r
+  )\r
 {\r
   IP6_PROTOCOL                  *Instance;\r
   EFI_SERVICE_BINDING_PROTOCOL  *ServiceBinding;\r
index 27550a5..8095ed1 100644 (file)
@@ -584,10 +584,11 @@ Ip6DriverBindingStart (
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 Ip6DestroyChildEntryInHandleBuffer (\r
   IN LIST_ENTRY         *Entry,\r
   IN VOID               *Context\r
-)\r
+  )\r
 {\r
   IP6_PROTOCOL                  *IpInstance;\r
   EFI_SERVICE_BINDING_PROTOCOL  *ServiceBinding;\r
index 79cd6ba..5f47938 100644 (file)
@@ -247,10 +247,11 @@ Mtftp6CreateInstance (
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 Mtftp6DestroyChildEntryInHandleBuffer (\r
   IN LIST_ENTRY         *Entry,\r
   IN VOID               *Context\r
-)\r
+  )\r
 {\r
   MTFTP6_INSTANCE               *Instance;\r
   EFI_SERVICE_BINDING_PROTOCOL  *ServiceBinding;\r
index 4e697b1..74af796 100644 (file)
@@ -342,10 +342,11 @@ ON_ERROR:
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 TcpDestroyChildEntryInHandleBuffer (\r
   IN LIST_ENTRY         *Entry,\r
   IN VOID               *Context\r
-)\r
+  )\r
 {\r
   SOCKET                        *Sock;\r
   EFI_SERVICE_BINDING_PROTOCOL  *ServiceBinding;\r
index 62c2b9a..1c2c333 100644 (file)
@@ -189,10 +189,11 @@ EXIT:
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 Udp6DestroyChildEntryInHandleBuffer (\r
   IN LIST_ENTRY         *Entry,\r
   IN VOID               *Context\r
-)\r
+  )\r
 {\r
   UDP6_INSTANCE_DATA            *Instance;\r
   EFI_SERVICE_BINDING_PROTOCOL  *ServiceBinding;\r