1 files changed, 9 insertions, 1 deletions
diff --git a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.c b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.c
index 0eef1acfc4..b9563f131b 100644
--- a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.c
+++ b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.c
@@ -26,6 +26,7 @@ Revision History
 //
 ESAL_VARIABLE_GLOBAL  *mVariableModuleGlobal;
 
+STATIC
 UINT32
 EFIAPI
 ArrayLength (
@@ -62,6 +63,7 @@ Returns:
   return (Count * 2) + 2;
 }
 
+STATIC
 VARIABLE_STORE_STATUS
 EFIAPI
 GetVariableStoreStatus (
@@ -103,6 +105,7 @@ Returns:
   }
 }
 
+STATIC
 UINT8 *
 EFIAPI
 GetVariableDataPtr (
@@ -133,6 +136,7 @@ Returns:
   return (UINT8 *) ((UINTN) GET_VARIABLE_NAME_PTR (Variable) + Variable->NameSize + GET_PAD_SIZE (Variable->NameSize));
 }
 
+STATIC
 VARIABLE_HEADER *
 EFIAPI
 GetNextVariablePtr (
@@ -173,6 +177,7 @@ Returns:
   return VarHeader;
 }
 
+STATIC
 VARIABLE_HEADER *
 EFIAPI
 GetEndPointer (
@@ -200,6 +205,7 @@ Returns:
   return (VARIABLE_HEADER *) ((UINTN) VolHeader + VolHeader->Size);
 }
 
+STATIC
 EFI_STATUS
 EFIAPI
 FindVariable (
@@ -413,7 +419,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;
@@ -449,6 +455,7 @@ Returns:
     }
   }
 
+Error:
   return EFI_NOT_FOUND;
 }
 
@@ -755,6 +762,7 @@ Returns:
 }
 #endif
 
+STATIC
 EFI_STATUS
 EFIAPI
 InitializeVariableStore (