Partially make EdkModulePkg pass intel IPF compiler with /W4 /WX switched on.

[mirror_edk2.git] / EdkModulePkg / Universal / Console / ConSplitter / Dxe / ConSplitter.c

diff --git a/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.c b/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.c
index 973f13d0f3e66390dfe70b30760bbbac08ddb7e2..34d6f266e95c421c715aebff9da9d54b258e8bab 100644 (file)
--- a/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.c
+++ b/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.c
@@ -531,6 +531,7 @@ ConSplitterTextOutConstructor (
   return Status;\r
 }\r
 \r
+STATIC\r
 EFI_STATUS\r
 ConSplitterSupported (\r
   IN  EFI_DRIVER_BINDING_PROTOCOL     *This,\r
@@ -717,6 +718,7 @@ Returns:
           );\r
 }\r
 \r
+STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterStart (\r
@@ -1026,6 +1028,7 @@ Returns:
   return Status;\r
 }\r
 \r
+STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterStop (\r
@@ -1499,6 +1502,7 @@ Returns:
   return EFI_NOT_FOUND;\r
 }\r
 \r
+STATIC\r
 EFI_STATUS\r
 ConSplitterGrowMapTable (\r
   IN  TEXT_OUT_SPLITTER_PRIVATE_DATA  *Private\r
@@ -1575,6 +1579,7 @@ Returns:
   return EFI_SUCCESS;\r
 }\r
 \r
+STATIC\r
 EFI_STATUS\r
 ConSplitterAddOutputMode (\r
   IN  TEXT_OUT_SPLITTER_PRIVATE_DATA  *Private,\r
@@ -1642,6 +1647,7 @@ Returns:
   return EFI_SUCCESS;\r
 }\r
 \r
+STATIC\r
 VOID\r
 ConSplitterGetIntersection (\r
   IN  INT32                           *TextOutModeMap,\r
@@ -1694,6 +1700,7 @@ ConSplitterGetIntersection (
   return ;\r
 }\r
 \r
+STATIC\r
 VOID\r
 ConSplitterSyncOutputMode (\r
   IN  TEXT_OUT_SPLITTER_PRIVATE_DATA  *Private,\r
@@ -1712,7 +1719,6 @@ Returns:
 \r
 --*/\r
 {\r
-  INT32                         CurrentMode;\r
   INT32                         CurrentMaxMode;\r
   INT32                         Mode;\r
   INT32                         Index;\r
@@ -1726,7 +1732,6 @@ Returns:
   //\r
   // Must make sure that current mode won't change even if mode number changes\r
   //\r
-  CurrentMode       = Private->TextOutMode.Mode;\r
   CurrentMaxMode    = Private->TextOutMode.MaxMode;\r
   TextOutModeMap    = Private->TextOutModeMap;\r
   StepSize          = Private->TextOutListCount;\r
@@ -1771,6 +1776,7 @@ Returns:
   return ;\r
 }\r
 \r
+STATIC\r
 EFI_STATUS\r
 ConSplitterGetIntersectionBetweenConOutAndStrErr (\r
   VOID\r
@@ -1796,8 +1802,6 @@ Returns:
   UINTN                         Indexj;\r
   UINTN                         Rows;\r
   UINTN                         Columns;\r
-  INT32                         ConOutCurrentMode;\r
-  INT32                         StdErrCurrentMode;\r
   INT32                         ConOutMaxMode;\r
   INT32                         StdErrMaxMode;\r
   INT32                         Mode;\r
@@ -1808,8 +1812,6 @@ Returns:
   INT32                         *StdErrMapTable;\r
   TEXT_OUT_SPLITTER_QUERY_DATA  *ConOutQueryData;\r
   TEXT_OUT_SPLITTER_QUERY_DATA  *StdErrQueryData;\r
-  UINTN                         ConOutStepSize;\r
-  UINTN                         StdErrStepSize;\r
   BOOLEAN                       FoundTheSameTextOut;\r
   UINTN                         ConOutMapTableSize;\r
   UINTN                         StdErrMapTableSize;\r
@@ -1843,16 +1845,12 @@ Returns:
   //\r
   // Must make sure that current mode won't change even if mode number changes\r
   //\r
-  ConOutCurrentMode = mConOut.TextOutMode.Mode;\r
   ConOutMaxMode     = mConOut.TextOutMode.MaxMode;\r
   ConOutModeMap     = mConOut.TextOutModeMap;\r
-  ConOutStepSize    = mConOut.TextOutListCount;\r
   ConOutQueryData   = mConOut.TextOutQueryData;\r
 \r
-  StdErrCurrentMode = mStdErr.TextOutMode.Mode;\r
   StdErrMaxMode     = mStdErr.TextOutMode.MaxMode;\r
   StdErrModeMap     = mStdErr.TextOutModeMap;\r
-  StdErrStepSize    = mStdErr.TextOutListCount;\r
   StdErrQueryData   = mStdErr.TextOutQueryData;\r
 \r
   //\r
@@ -1933,6 +1931,7 @@ Returns:
 }\r
 \r
 #if (EFI_SPECIFICATION_VERSION >= 0x00020000)\r
+STATIC\r
 EFI_STATUS\r
 ConSplitterAddGraphicsOutputMode (\r
   IN  TEXT_OUT_SPLITTER_PRIVATE_DATA  *Private,\r
@@ -2726,6 +2725,7 @@ ConSplitterSimplePointerReset (
   return ReturnStatus;\r
 }\r
 \r
+STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterSimplePointerPrivateGetState (\r