From 1f7eb561d906e47d6dec2fb1406c1a8694f2bd38 Mon Sep 17 00:00:00 2001 From: sfu5 Date: Mon, 17 Dec 2012 06:48:35 +0000 Subject: [PATCH] Fix GCC build fail issue for MdeModulePkg and NetworkPkg. Signed-off-by: Fu Siyuan Reviewed-by: Ye Ting Reviewed-by: Ouyang Qian git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@14007 6f19259b-4bc3-4df7-8a09-765794883524 --- MdeModulePkg/Include/Library/NetLib.h | 7 ++++--- MdeModulePkg/Library/DxeNetLib/DxeNetLib.c | 4 ++-- MdeModulePkg/Universal/Network/ArpDxe/ArpDriver.c | 3 ++- MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.c | 3 ++- MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.c | 3 ++- MdeModulePkg/Universal/Network/MnpDxe/MnpConfig.c | 3 ++- MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.c | 6 ++++-- MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.c | 3 ++- MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.h | 2 +- MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.c | 3 ++- MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Driver.c | 3 ++- NetworkPkg/Dhcp6Dxe/Dhcp6Driver.c | 3 ++- NetworkPkg/Ip6Dxe/Ip6Common.c | 3 ++- NetworkPkg/Ip6Dxe/Ip6Driver.c | 3 ++- NetworkPkg/Mtftp6Dxe/Mtftp6Driver.c | 3 ++- NetworkPkg/TcpDxe/TcpDriver.c | 3 ++- NetworkPkg/Udp6Dxe/Udp6Driver.c | 3 ++- 17 files changed, 37 insertions(+), 21 deletions(-) diff --git a/MdeModulePkg/Include/Library/NetLib.h b/MdeModulePkg/Include/Library/NetLib.h index d85c259b86..7ad8dac446 100644 --- a/MdeModulePkg/Include/Library/NetLib.h +++ b/MdeModulePkg/Include/Library/NetLib.h @@ -677,7 +677,7 @@ EFI_STATUS (EFIAPI *NET_DESTROY_LINK_LIST_CALLBACK) ( IN LIST_ENTRY *Entry, IN VOID *Context OPTIONAL -); + ); /** Safe destroy nodes in a linked list, and return the length of the list after all possible operations finished. @@ -708,7 +708,7 @@ NetDestroyLinkList ( IN NET_DESTROY_LINK_LIST_CALLBACK CallBack, IN VOID *Context, OPTIONAL OUT UINTN *ListLength OPTIONAL -); + ); /** This function checks the input Handle to see if it's one of these handles in ChildHandleBuffer. @@ -723,11 +723,12 @@ NetDestroyLinkList ( **/ BOOLEAN +EFIAPI NetIsInHandleBuffer ( IN EFI_HANDLE Handle, IN UINTN NumberOfChildren, IN EFI_HANDLE *ChildHandleBuffer OPTIONAL -); + ); // // Object container: EFI network stack spec defines various kinds of diff --git a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c b/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c index 174c3c83f7..50e40c8eba 100644 --- a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c +++ b/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c @@ -1095,7 +1095,7 @@ NetDestroyLinkList ( IN NET_DESTROY_LINK_LIST_CALLBACK CallBack, IN VOID *Context, OPTIONAL OUT UINTN *ListLength OPTIONAL -) + ) { UINTN PreviousLength; LIST_ENTRY *Entry; @@ -1158,7 +1158,7 @@ NetIsInHandleBuffer ( IN EFI_HANDLE Handle, IN UINTN NumberOfChildren, IN EFI_HANDLE *ChildHandleBuffer OPTIONAL -) + ) { UINTN Index; diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ArpDriver.c b/MdeModulePkg/Universal/Network/ArpDxe/ArpDriver.c index 8914ebfa34..81ddd62634 100644 --- a/MdeModulePkg/Universal/Network/ArpDxe/ArpDriver.c +++ b/MdeModulePkg/Universal/Network/ArpDxe/ArpDriver.c @@ -252,10 +252,11 @@ ArpCleanService ( **/ EFI_STATUS +EFIAPI ArpDestroyChildEntryInHandleBuffer ( IN LIST_ENTRY *Entry, IN VOID *Context -) + ) { ARP_INSTANCE_DATA *Instance; EFI_SERVICE_BINDING_PROTOCOL *ServiceBinding; diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.c b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.c index 20758d38cf..d1bba3022a 100644 --- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.c +++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.c @@ -364,10 +364,11 @@ ON_ERROR: **/ EFI_STATUS +EFIAPI Dhcp4DestroyChildEntry ( IN LIST_ENTRY *Entry, IN VOID *Context -) + ) { DHCP_PROTOCOL *Instance; EFI_SERVICE_BINDING_PROTOCOL *ServiceBinding; diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.c index 5a84837a44..4a3d342711 100644 --- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.c +++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.c @@ -406,10 +406,11 @@ Ip4CleanService ( **/ EFI_STATUS +EFIAPI Ip4DestroyChildEntryInHandleBuffer ( IN LIST_ENTRY *Entry, IN VOID *Context -) + ) { IP4_PROTOCOL *IpInstance; EFI_SERVICE_BINDING_PROTOCOL *ServiceBinding; diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpConfig.c b/MdeModulePkg/Universal/Network/MnpDxe/MnpConfig.c index 9586db7a2e..046d4dfddc 100644 --- a/MdeModulePkg/Universal/Network/MnpDxe/MnpConfig.c +++ b/MdeModulePkg/Universal/Network/MnpDxe/MnpConfig.c @@ -696,10 +696,11 @@ MnpDestroyServiceData ( **/ EFI_STATUS +EFIAPI MnpDestoryChildEntry ( IN LIST_ENTRY *Entry, IN VOID *Context -) + ) { MNP_INSTANCE_DATA *Instance; EFI_SERVICE_BINDING_PROTOCOL *ServiceBinding; diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.c b/MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.c index 84c618c27d..2ddcec8962 100644 --- a/MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.c +++ b/MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.c @@ -37,10 +37,11 @@ EFI_DRIVER_BINDING_PROTOCOL gMnpDriverBinding = { **/ EFI_STATUS +EFIAPI MnpDestroyServiceDataEntry ( IN LIST_ENTRY *Entry, IN VOID *Context -) + ) { MNP_SERVICE_DATA *MnpServiceData; @@ -59,10 +60,11 @@ MnpDestroyServiceDataEntry ( **/ EFI_STATUS +EFIAPI MnpDestroyServiceChildEntry ( IN LIST_ENTRY *Entry, IN VOID *Context -) + ) { MNP_SERVICE_DATA *MnpServiceData; diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.c b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.c index 8da47fc8df..a23d405baa 100644 --- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.c +++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.c @@ -328,10 +328,11 @@ ON_ERROR: **/ EFI_STATUS +EFIAPI Mtftp4DestroyChildEntryInHandleBuffer ( IN LIST_ENTRY *Entry, IN VOID *Context -) + ) { MTFTP4_PROTOCOL *Instance; EFI_SERVICE_BINDING_PROTOCOL *ServiceBinding; diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.h b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.h index 329c6d897a..527fd1db10 100644 --- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.h +++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.h @@ -34,7 +34,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include #include #include -#include +#include extern EFI_MTFTP4_PROTOCOL gMtftp4ProtocolTemplate; diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.c index 1021252300..76eac722cb 100644 --- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.c +++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.c @@ -147,10 +147,11 @@ Tcp4DestroyTimer ( **/ EFI_STATUS +EFIAPI Tcp4DestroyChildEntryInHandleBuffer ( IN LIST_ENTRY *Entry, IN VOID *Context -) + ) { SOCKET *Sock; EFI_SERVICE_BINDING_PROTOCOL *ServiceBinding; diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Driver.c b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Driver.c index 96b08d14e9..34e15da432 100644 --- a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Driver.c +++ b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Driver.c @@ -39,10 +39,11 @@ EFI_SERVICE_BINDING_PROTOCOL mUdp4ServiceBinding = { **/ EFI_STATUS +EFIAPI Udp4DestroyChildEntryInHandleBuffer ( IN LIST_ENTRY *Entry, IN VOID *Context -) + ) { UDP4_INSTANCE_DATA *Instance; EFI_SERVICE_BINDING_PROTOCOL *ServiceBinding; diff --git a/NetworkPkg/Dhcp6Dxe/Dhcp6Driver.c b/NetworkPkg/Dhcp6Dxe/Dhcp6Driver.c index 42caefb154..de53a1a9b4 100644 --- a/NetworkPkg/Dhcp6Dxe/Dhcp6Driver.c +++ b/NetworkPkg/Dhcp6Dxe/Dhcp6Driver.c @@ -337,10 +337,11 @@ Dhcp6CreateInstance ( **/ EFI_STATUS +EFIAPI Dhcp6DestroyChildEntry ( IN LIST_ENTRY *Entry, IN VOID *Context -) + ) { DHCP6_INSTANCE *Instance; EFI_SERVICE_BINDING_PROTOCOL *ServiceBinding; diff --git a/NetworkPkg/Ip6Dxe/Ip6Common.c b/NetworkPkg/Ip6Dxe/Ip6Common.c index 459acd239f..18ec012a1e 100644 --- a/NetworkPkg/Ip6Dxe/Ip6Common.c +++ b/NetworkPkg/Ip6Dxe/Ip6Common.c @@ -339,10 +339,11 @@ Ip6AddAddr ( **/ EFI_STATUS +EFIAPI Ip6DestroyChildEntryByAddr ( IN LIST_ENTRY *Entry, IN VOID *Context -) + ) { IP6_PROTOCOL *Instance; EFI_SERVICE_BINDING_PROTOCOL *ServiceBinding; diff --git a/NetworkPkg/Ip6Dxe/Ip6Driver.c b/NetworkPkg/Ip6Dxe/Ip6Driver.c index 27550a5b3e..8095ed1ae2 100644 --- a/NetworkPkg/Ip6Dxe/Ip6Driver.c +++ b/NetworkPkg/Ip6Dxe/Ip6Driver.c @@ -584,10 +584,11 @@ Ip6DriverBindingStart ( **/ EFI_STATUS +EFIAPI Ip6DestroyChildEntryInHandleBuffer ( IN LIST_ENTRY *Entry, IN VOID *Context -) + ) { IP6_PROTOCOL *IpInstance; EFI_SERVICE_BINDING_PROTOCOL *ServiceBinding; diff --git a/NetworkPkg/Mtftp6Dxe/Mtftp6Driver.c b/NetworkPkg/Mtftp6Dxe/Mtftp6Driver.c index 79cd6bae5a..5f47938c2d 100644 --- a/NetworkPkg/Mtftp6Dxe/Mtftp6Driver.c +++ b/NetworkPkg/Mtftp6Dxe/Mtftp6Driver.c @@ -247,10 +247,11 @@ Mtftp6CreateInstance ( **/ EFI_STATUS +EFIAPI Mtftp6DestroyChildEntryInHandleBuffer ( IN LIST_ENTRY *Entry, IN VOID *Context -) + ) { MTFTP6_INSTANCE *Instance; EFI_SERVICE_BINDING_PROTOCOL *ServiceBinding; diff --git a/NetworkPkg/TcpDxe/TcpDriver.c b/NetworkPkg/TcpDxe/TcpDriver.c index 4e697b1f4e..74af7969f7 100644 --- a/NetworkPkg/TcpDxe/TcpDriver.c +++ b/NetworkPkg/TcpDxe/TcpDriver.c @@ -342,10 +342,11 @@ ON_ERROR: **/ EFI_STATUS +EFIAPI TcpDestroyChildEntryInHandleBuffer ( IN LIST_ENTRY *Entry, IN VOID *Context -) + ) { SOCKET *Sock; EFI_SERVICE_BINDING_PROTOCOL *ServiceBinding; diff --git a/NetworkPkg/Udp6Dxe/Udp6Driver.c b/NetworkPkg/Udp6Dxe/Udp6Driver.c index 62c2b9affd..1c2c33336e 100644 --- a/NetworkPkg/Udp6Dxe/Udp6Driver.c +++ b/NetworkPkg/Udp6Dxe/Udp6Driver.c @@ -189,10 +189,11 @@ EXIT: **/ EFI_STATUS +EFIAPI Udp6DestroyChildEntryInHandleBuffer ( IN LIST_ENTRY *Entry, IN VOID *Context -) + ) { UDP6_INSTANCE_DATA *Instance; EFI_SERVICE_BINDING_PROTOCOL *ServiceBinding; -- 2.39.2