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

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

EdkModulePkg/Universal/Variable/Pei/Variable.c

@@ -68,6 +68,7 @@ Returns:
 
 }
 
+STATIC
 VARIABLE_HEADER *
 GetNextVariablePtr (
   IN VARIABLE_HEADER  *Variable
@@ -90,6 +91,7 @@ Returns:
   return (VARIABLE_HEADER *) ((UINTN) GET_VARIABLE_DATA_PTR (Variable) + Variable->DataSize + GET_PAD_SIZE (Variable->DataSize));
 }
 
+STATIC
 BOOLEAN
 EFIAPI
 IsValidVariableHeader (
@@ -120,6 +122,7 @@ Returns:
   return TRUE;
 }
 
+STATIC
 VARIABLE_STORE_STATUS
 EFIAPI
 GetVariableStoreStatus (
@@ -163,6 +166,7 @@ Returns:
   }
 }
 
+STATIC
 EFI_STATUS
 CompareWithValidVariable (
   IN  VARIABLE_HEADER         *Variable,
@@ -215,6 +219,7 @@ Returns:
   return EFI_NOT_FOUND;
 }
 
+STATIC
 EFI_STATUS
 EFIAPI
 FindVariable (

EdkModulePkg/Universal/Variable/RuntimeDxe/Ipf/InitVariable.c

@@ -26,6 +26,7 @@ Revision History
 //
 extern ESAL_VARIABLE_GLOBAL *mVariableModuleGlobal;
 
+STATIC
 SAL_RETURN_REGS
 EsalVariableCommonEntry (
   IN  UINT64                                      FunctionId,

EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.c

@@ -27,6 +27,7 @@ Revision History
 //
 ESAL_VARIABLE_GLOBAL  *mVariableModuleGlobal;
 
+STATIC
 UINT32
 EFIAPI
 ArrayLength (
@@ -63,6 +64,7 @@ Returns:
   return (Count * 2) + 2;
 }
 
+STATIC
 BOOLEAN
 EFIAPI
 IsValidVariableHeader (
@@ -93,6 +95,7 @@ Returns:
   return TRUE;
 }
 
+STATIC
 EFI_STATUS
 EFIAPI
 UpdateVariableStore (
@@ -242,6 +245,7 @@ Returns:
   return EFI_SUCCESS;
 }
 
+STATIC
 VARIABLE_STORE_STATUS
 EFIAPI
 GetVariableStoreStatus (
@@ -283,6 +287,7 @@ Returns:
   }
 }
 
+STATIC
 UINT8 *
 EFIAPI
 GetVariableDataPtr (
@@ -310,6 +315,7 @@ Returns:
   return (UINT8 *) ((UINTN) GET_VARIABLE_NAME_PTR (Variable) + Variable->NameSize + GET_PAD_SIZE (Variable->NameSize));
 }
 
+STATIC
 VARIABLE_HEADER *
 EFIAPI
 GetNextVariablePtr (
@@ -340,6 +346,7 @@ Returns:
   return (VARIABLE_HEADER *) ((UINTN) GetVariableDataPtr (Variable) + Variable->DataSize + GET_PAD_SIZE (Variable->DataSize));
 }
 
+STATIC
 VARIABLE_HEADER *
 EFIAPI
 GetEndPointer (
@@ -367,6 +374,7 @@ Returns:
   return (VARIABLE_HEADER *) ((UINTN) VarStoreHeader + VarStoreHeader->Size);
 }
 
+STATIC
 EFI_STATUS
 EFIAPI
 Reclaim (
@@ -487,6 +495,7 @@ Returns:
   return Status;
 }
 
+STATIC
 EFI_STATUS
 EFIAPI
 FindVariable (
@@ -707,7 +716,7 @@ Returns:
         Variable.StartPtr = (VARIABLE_HEADER *) ((UINTN) (Global->VolatileVariableBase + sizeof (VARIABLE_STORE_HEADER)));
         Variable.EndPtr = (VARIABLE_HEADER *) GetEndPointer ((VARIABLE_STORE_HEADER *) ((UINTN) Global->VolatileVariableBase));
       } else {
-        return EFI_NOT_FOUND;
+        goto Error;
       }
 
       Variable.CurrPtr = Variable.StartPtr;
@@ -745,6 +754,7 @@ Returns:
     Variable.CurrPtr = GetNextVariablePtr (Variable.CurrPtr);
   }
 
+Error:
   return EFI_NOT_FOUND;
 }
 

EdkModulePkg/Universal/Variable/RuntimeDxe/reclaim.c

@@ -86,6 +86,7 @@ GetFvbHandleByAddress (
   return Status;
 }
 
+STATIC
 EFI_STATUS
 GetLbaAndOffsetByAddress (
   IN  EFI_PHYSICAL_ADDRESS   Address,