Patch to remove STATIC modifier. This is on longer recommended by EFI Framework coding style. All duplicated symbols has been renamed accordingly.

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

10 files changed, 8 insertions, 53 deletions

diff --git a/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.c b/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.c
index 9772f97325..020b94982d 100644
--- a/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.c
+++ b/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.c
@@ -54,7 +54,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   @retval EFI_OUT_OF_RESOURCES    There are not enough resources to record the measurement.

 

 **/

-STATIC

 EFI_STATUS

 EFIAPI

 StartGauge (

@@ -88,7 +87,6 @@ StartGauge (
   @retval EFI_NOT_FOUND           The specified measurement record could not be found.

 

 **/

-STATIC

 EFI_STATUS

 EFIAPI

 EndGauge (

@@ -116,7 +114,6 @@ EndGauge (
   @retval EFI_INVALIDE_PARAMETER  GaugeDataEntry is NULL.

 

 **/

-STATIC

 EFI_STATUS

 EFIAPI

 GetGauge (

@@ -127,8 +124,8 @@ GetGauge (
 //

 // Definition for global variables.

 //

-STATIC GAUGE_DATA_HEADER    *mGaugeData;

-STATIC UINT32               mMaxGaugeRecords;

+GAUGE_DATA_HEADER    *mGaugeData;

+UINT32               mMaxGaugeRecords;

 

 EFI_HANDLE           mHandle = NULL;

 PERFORMANCE_PROTOCOL mPerformanceInterface = {

@@ -156,7 +153,6 @@ PERFORMANCE_PROTOCOL mPerformanceInterface = {
   @retval The index of gauge entry in the array.

 

 **/

-STATIC

 UINT32

 InternalSearchForGaugeEntry (

   IN CONST VOID                 *Handle,  OPTIONAL

@@ -214,7 +210,6 @@ InternalSearchForGaugeEntry (
   @retval EFI_OUT_OF_RESOURCES    There are not enough resources to record the measurement.

 

 **/

-STATIC

 EFI_STATUS

 EFIAPI

 StartGauge (

@@ -297,7 +292,6 @@ StartGauge (
   @retval EFI_NOT_FOUND           The specified measurement record could not be found.

 

 **/

-STATIC

 EFI_STATUS

 EFIAPI

 EndGauge (

@@ -342,7 +336,6 @@ EndGauge (
   @retval EFI_INVALIDE_PARAMETER  GaugeDataEntry is NULL.

 

 **/

-STATIC

 EFI_STATUS

 EFIAPI

 GetGauge (

@@ -379,7 +372,6 @@ GetGauge (
   to DXE performance data structures.

 

 **/

-STATIC

 VOID

 InternalGetPeiPerformance (

   VOID

diff --git a/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.c b/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.c
index 025bcdb5a7..d55ee8b0ce 100644
--- a/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.c
+++ b/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.c
@@ -58,7 +58,7 @@ EFI_IP4_CONFIG_DATA  mIpIoDefaultIpConfigData = {
   0

 };

 

-STATIC ICMP_ERROR_INFO  mIcmpErrMap[10] = {

+ICMP_ERROR_INFO  mIcmpErrMap[10] = {

   {FALSE, TRUE},

   {FALSE, TRUE},

   {TRUE, TRUE},

@@ -71,14 +71,12 @@ STATIC ICMP_ERROR_INFO  mIcmpErrMap[10] = {
   {FALSE, TRUE}

 };

 

-STATIC

 VOID

 EFIAPI

 IpIoTransmitHandlerDpc (

   IN VOID      *Context

   );

 

-STATIC

 VOID

 EFIAPI

 IpIoTransmitHandler (

@@ -101,7 +99,6 @@ IpIoTransmitHandler (
   @retval other                 The required operation failed.

 

 **/

-STATIC

 EFI_STATUS

 IpIoCreateIpChildOpenProtocol (

   IN  EFI_HANDLE  ControllerHandle,

@@ -164,7 +161,6 @@ IpIoCreateIpChildOpenProtocol (
   @retval other                 The required operation failed.

 

 **/

-STATIC

 EFI_STATUS

 IpIoCloseProtocolDestroyIpChild (

   IN EFI_HANDLE  ControllerHandle,

@@ -209,7 +205,6 @@ IpIoCloseProtocolDestroyIpChild (
   @retval EFI_ABORTED           This type of ICMP packet is not supported.

 

 **/

-STATIC

 EFI_STATUS

 IpIoIcmpHandler (

   IN IP_IO                *IpIo,

@@ -341,7 +336,6 @@ IpIoIcmpHandler (
   @return None.

 

 **/

-STATIC

 VOID

 IpIoExtFree (

   IN VOID  *Event

@@ -366,7 +360,6 @@ IpIoExtFree (
   @return resource limit occurred.

 

 **/

-STATIC

 IP_IO_SEND_ENTRY *

 IpIoCreateSndEntry (

   IN IP_IO             *IpIo,

@@ -502,7 +495,6 @@ ReleaseSndEntry:
   @return None.

 

 **/

-STATIC

 VOID

 IpIoDestroySndEntry (

   IN IP_IO_SEND_ENTRY  *SndEntry

@@ -535,7 +527,6 @@ IpIoDestroySndEntry (
   @return None.

 

 **/

-STATIC

 VOID

 EFIAPI

 IpIoTransmitHandlerDpc (

@@ -571,7 +562,6 @@ IpIoTransmitHandlerDpc (
 

 **/

 

-STATIC

 VOID

 EFIAPI

 IpIoTransmitHandler (

@@ -594,7 +584,6 @@ IpIoTransmitHandler (
   @return None.

 

 **/

-STATIC

 VOID

 EFIAPI

 IpIoDummyHandlerDpc (

@@ -631,7 +620,6 @@ IpIoDummyHandlerDpc (
   @return None.

 

 **/

-STATIC

 VOID

 EFIAPI

 IpIoDummyHandler (

@@ -655,7 +643,6 @@ IpIoDummyHandler (
   @return None.

 

 **/

-STATIC

 VOID

 EFIAPI

 IpIoListenHandlerDpc (

@@ -757,7 +744,6 @@ Resume:
   @return None.

 

 **/

-STATIC

 VOID

 EFIAPI

 IpIoListenHandler (

diff --git a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c b/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
index a3ea083b51..58e3541a2d 100644
--- a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
+++ b/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
@@ -486,7 +486,6 @@ NetMapGetCount (
   @return The allocated item or NULL

 

 **/

-STATIC

 NET_MAP_ITEM *

 NetMapAllocItem (

   IN NET_MAP                *Map

@@ -609,7 +608,6 @@ NetMapInsertTail (
   @return TRUE if the item is in the netmap, otherwise FALSE.

 

 **/

-STATIC

 BOOLEAN

 NetItemInMap (

   IN NET_MAP                *Map,

@@ -1116,7 +1114,6 @@ NetLibGetMacString (
   @retval FALSE          If the default address is acquired from DHCP.

 

 **/

-STATIC

 BOOLEAN

 NetLibDefaultAddressIsStatic (

   IN EFI_HANDLE  Controller

diff --git a/MdeModulePkg/Library/DxeNetLib/NetBuffer.c b/MdeModulePkg/Library/DxeNetLib/NetBuffer.c
index 427073d66d..03e495bc58 100644
--- a/MdeModulePkg/Library/DxeNetLib/NetBuffer.c
+++ b/MdeModulePkg/Library/DxeNetLib/NetBuffer.c
@@ -41,7 +41,6 @@ Abstract:
                                 allocation failed due to resource limit.

 

 **/

-STATIC

 NET_BUF *

 NetbufAllocStruct (

   IN UINT32                 BlockNum,

@@ -152,7 +151,6 @@ FreeNBuf:
   @return None.

 

 **/

-STATIC

 VOID

 NetbufFreeVector (

   IN NET_VECTOR             *Vector

@@ -415,7 +413,6 @@ NetbufGetByte (
   @return None.

 

 **/

-STATIC

 VOID

 NetbufSetBlock (

   IN NET_BUF                *Nbuf,

@@ -458,7 +455,6 @@ NetbufSetBlock (
   @return None.

 

 **/

-STATIC

 VOID

 NetbufSetBlockOp (

   IN NET_BUF                *Nbuf,

@@ -492,7 +488,6 @@ NetbufSetBlockOp (
   @return NONE

 

 **/

-STATIC

 VOID

 NetbufGetFragmentFree (

   IN VOID                   *Arg

@@ -1120,7 +1115,6 @@ NetbufAllocSpace (
   @return None.

 

 **/

-STATIC

 VOID

 NetblockTrim (

   IN NET_BLOCK_OP           *BlockOp,

diff --git a/MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.c b/MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.c
index 8424151537..35a50f726b 100644
--- a/MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.c
+++ b/MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.c
@@ -22,7 +22,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/UefiBootServicesTableLib.h>

 #include <Library/PcdLib.h>

 

-STATIC PERFORMANCE_PROTOCOL    *mPerformance = NULL;

+PERFORMANCE_PROTOCOL    *mPerformance = NULL;

 

 /**

   The constructor function caches the pointer to Performance protocol.

@@ -34,7 +34,6 @@ STATIC PERFORMANCE_PROTOCOL    *mPerformance = NULL;
   @retval Other           Performance protocol is not located to log performance.

 

 **/

-STATIC

 EFI_STATUS

 GetPerformanceProtocol (

   VOID

diff --git a/MdeModulePkg/Library/DxePlatDriOverLib/PlatDriOverLib.c b/MdeModulePkg/Library/DxePlatDriOverLib/PlatDriOverLib.c
index 497446b10a..e6f37c8a55 100644
--- a/MdeModulePkg/Library/DxePlatDriOverLib/PlatDriOverLib.c
+++ b/MdeModulePkg/Library/DxePlatDriOverLib/PlatDriOverLib.c
@@ -20,7 +20,7 @@ Abstract:
 

 #include "PlatDriOver.h"

 

-STATIC LIST_ENTRY   mDevicePathStack = INITIALIZE_LIST_HEAD_VARIABLE (mDevicePathStack);

+LIST_ENTRY   mDevicePathStack = INITIALIZE_LIST_HEAD_VARIABLE (mDevicePathStack);

 

 

 /**

diff --git a/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.c b/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.c
index ff9cb364f7..c24f88827e 100644
--- a/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.c
+++ b/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.c
@@ -32,14 +32,12 @@ Abstract:
 #include <Library/MemoryAllocationLib.h>

 #include <Library/BaseMemoryLib.h>

 

-STATIC

 VOID

 EFIAPI

 UdpIoOnDgramSentDpc (

   IN VOID                   *Context

   );

 

-STATIC

 VOID

 EFIAPI

 UdpIoOnDgramSent (

@@ -47,7 +45,6 @@ UdpIoOnDgramSent (
   IN VOID                   *Context

   );

 

-STATIC

 VOID

 EFIAPI

 UdpIoOnDgramRcvd (

@@ -69,7 +66,6 @@ UdpIoOnDgramRcvd (
   @return The wrapped transmission request or NULL if failed to allocate resources.

 

 **/

-STATIC

 UDP_TX_TOKEN *

 UdpIoWrapTx (

   IN UDP_IO_PORT            *UdpIo,

@@ -355,7 +351,6 @@ FREE_MEM:
   @return None

 

 **/

-STATIC

 VOID

 UdpIoCancelDgrams (

   IN UDP_IO_PORT            *UdpIo,

@@ -476,7 +471,6 @@ UdpIoCleanPort (
   @return None

 

 **/

-STATIC

 VOID

 EFIAPI

 UdpIoOnDgramSentDpc (

@@ -503,7 +497,6 @@ UdpIoOnDgramSentDpc (
   @return None

 

 **/

-STATIC

 VOID

 EFIAPI

 UdpIoOnDgramSent (

@@ -579,7 +572,6 @@ UdpIoSendDatagram (
   @return TRUE if the packet is to be cancelled, otherwise FALSE.

 

 **/

-STATIC

 BOOLEAN

 UdpIoCancelSingleDgram (

   IN UDP_TX_TOKEN           *Token,

@@ -626,7 +618,6 @@ UdpIoCancelSentDatagram (
   @return None

 

 **/

-STATIC

 VOID

 UdpIoRecycleDgram (

   IN VOID                   *Context

@@ -649,7 +640,6 @@ UdpIoRecycleDgram (
   @return None

 

 **/

-STATIC

 VOID

 EFIAPI

 UdpIoOnDgramRcvdDpc (

@@ -730,7 +720,6 @@ UdpIoOnDgramRcvdDpc (
   @return None

 

 **/

-STATIC

 VOID

 EFIAPI

 UdpIoOnDgramRcvd (

diff --git a/MdeModulePkg/Library/EdkDxePrintLib/PrintLib.c b/MdeModulePkg/Library/EdkDxePrintLib/PrintLib.c
index 1659327dc5..03633f6440 100644
--- a/MdeModulePkg/Library/EdkDxePrintLib/PrintLib.c
+++ b/MdeModulePkg/Library/EdkDxePrintLib/PrintLib.c
@@ -23,7 +23,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/PrintLib.h>

 #include <Library/UefiBootServicesTableLib.h>

 

-static EFI_PRINT2_PROTOCOL  *gPrintProtocol = NULL;

+EFI_PRINT2_PROTOCOL  *gPrintProtocol = NULL;

 

 EFI_STATUS

 EFIAPI

diff --git a/MdeModulePkg/Library/GenericBdsLib/Performance.c b/MdeModulePkg/Library/GenericBdsLib/Performance.c
index e88b50fa6a..0e3f7936cd 100644
--- a/MdeModulePkg/Library/GenericBdsLib/Performance.c
+++ b/MdeModulePkg/Library/GenericBdsLib/Performance.c
@@ -16,8 +16,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 

 #include "InternalBdsLib.h"

 

-STATIC PERF_HEADER               mPerfHeader;

-STATIC PERF_DATA                 mPerfData;

+PERF_HEADER               mPerfHeader;

+PERF_DATA                 mPerfData;

 

 /**

   Get the short verion of PDB file name to be

diff --git a/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.c b/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.c
index a6666a9c1c..64b488369a 100644
--- a/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.c
+++ b/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.c
@@ -43,7 +43,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   @retval The index of log entry in the array.

 

 **/

-STATIC

 PEI_PERFORMANCE_LOG_HEADER *

 InternalGetPerformanceHobLog (

   VOID

@@ -91,7 +90,6 @@ InternalGetPerformanceHobLog (
   @retval The index of log entry in the array.

 

 **/

-STATIC

 UINT32

 InternalSearchForLogEntry (

   IN PEI_PERFORMANCE_LOG_HEADER *PeiPerformanceLog,