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@6302 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
@@ -35,15 +35,13 @@ VARIABLE_STORE_HEADER mStoreHeaderTemplate = {
|
||||
//
|
||||
VARIABLE_GLOBAL *mGlobal;
|
||||
|
||||
STATIC
|
||||
VOID
|
||||
EFIAPI
|
||||
OnVirtualAddressChange (
|
||||
OnVirtualAddressChangeFsv (
|
||||
IN EFI_EVENT Event,
|
||||
IN VOID *Context
|
||||
);
|
||||
|
||||
STATIC
|
||||
VOID
|
||||
EFIAPI
|
||||
OnSimpleFileSystemInstall (
|
||||
@@ -51,7 +49,6 @@ OnSimpleFileSystemInstall (
|
||||
IN VOID *Context
|
||||
);
|
||||
|
||||
STATIC
|
||||
BOOLEAN
|
||||
IsValidVariableHeader (
|
||||
IN VARIABLE_HEADER *Variable
|
||||
@@ -81,7 +78,6 @@ Returns:
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
STATIC
|
||||
VARIABLE_STORE_STATUS
|
||||
GetVariableStoreStatus (
|
||||
IN VARIABLE_STORE_HEADER *VarStoreHeader
|
||||
@@ -121,7 +117,6 @@ Returns:
|
||||
}
|
||||
}
|
||||
|
||||
STATIC
|
||||
UINT8 *
|
||||
GetVariableDataPtr (
|
||||
IN VARIABLE_HEADER *Variable
|
||||
@@ -148,7 +143,6 @@ Returns:
|
||||
return (UINT8 *) ((UINTN) GET_VARIABLE_NAME_PTR (Variable) + Variable->NameSize + GET_PAD_SIZE (Variable->NameSize));
|
||||
}
|
||||
|
||||
STATIC
|
||||
VARIABLE_HEADER *
|
||||
GetNextVariablePtr (
|
||||
IN VARIABLE_HEADER *Variable
|
||||
@@ -178,7 +172,6 @@ Returns:
|
||||
return (VARIABLE_HEADER *) ((UINTN) GetVariableDataPtr (Variable) + Variable->DataSize + GET_PAD_SIZE (Variable->DataSize));
|
||||
}
|
||||
|
||||
STATIC
|
||||
VARIABLE_HEADER *
|
||||
GetEndPointer (
|
||||
IN VARIABLE_STORE_HEADER *VarStoreHeader
|
||||
@@ -250,7 +243,6 @@ Returns:
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
STATIC
|
||||
EFI_STATUS
|
||||
Reclaim (
|
||||
IN VARIABLE_STORAGE_TYPE StorageType,
|
||||
@@ -374,7 +366,6 @@ Returns:
|
||||
return Status;
|
||||
}
|
||||
|
||||
STATIC
|
||||
EFI_STATUS
|
||||
FindVariable (
|
||||
IN CHAR16 *VariableName,
|
||||
@@ -1305,10 +1296,9 @@ Returns:
|
||||
|
||||
|
||||
|
||||
STATIC
|
||||
VOID
|
||||
EFIAPI
|
||||
OnVirtualAddressChange (
|
||||
OnVirtualAddressChangeFsv (
|
||||
IN EFI_EVENT Event,
|
||||
IN VOID *Context
|
||||
)
|
||||
|
@@ -28,22 +28,19 @@ VOID *mSFSRegistration;
|
||||
// Prototypes
|
||||
//
|
||||
|
||||
STATIC
|
||||
VOID
|
||||
EFIAPI
|
||||
OnVirtualAddressChange (
|
||||
OnVirtualAddressChangeFs (
|
||||
IN EFI_EVENT Event,
|
||||
IN VOID *Context
|
||||
);
|
||||
|
||||
STATIC
|
||||
EFI_STATUS
|
||||
EFIAPI
|
||||
FileEraseStore(
|
||||
IN VARIABLE_STORAGE *This
|
||||
);
|
||||
|
||||
STATIC
|
||||
EFI_STATUS
|
||||
EFIAPI
|
||||
FileWriteStore (
|
||||
@@ -53,7 +50,6 @@ FileWriteStore (
|
||||
IN VOID *Buffer
|
||||
);
|
||||
|
||||
STATIC
|
||||
EFI_STATUS
|
||||
OpenStore (
|
||||
IN EFI_DEVICE_PATH_PROTOCOL *Device,
|
||||
@@ -65,7 +61,6 @@ OpenStore (
|
||||
//
|
||||
// Implementation below:
|
||||
//
|
||||
STATIC
|
||||
VOID
|
||||
FileClose (
|
||||
IN EFI_FILE *File
|
||||
@@ -173,7 +168,6 @@ CheckStoreExists (
|
||||
// read the store_header, init store_header if it has not been inited (read sth. about format/heathy)
|
||||
// reclaim space using scratch memory
|
||||
|
||||
STATIC
|
||||
VOID
|
||||
EFIAPI
|
||||
OnSimpleFileSystemInstall (
|
||||
@@ -282,11 +276,10 @@ FileStorageConstructor (
|
||||
ASSERT_EFI_ERROR (Status);
|
||||
|
||||
*VarStore = &Dev->VarStore;
|
||||
*GoVirtualEvent = OnVirtualAddressChange;
|
||||
*GoVirtualEvent = OnVirtualAddressChangeFs;
|
||||
return EFI_SUCCESS;
|
||||
}
|
||||
|
||||
STATIC
|
||||
EFI_STATUS
|
||||
EFIAPI
|
||||
FileEraseStore(
|
||||
@@ -320,7 +313,6 @@ FileEraseStore(
|
||||
return Status;
|
||||
}
|
||||
|
||||
STATIC
|
||||
EFI_STATUS
|
||||
EFIAPI
|
||||
FileWriteStore (
|
||||
@@ -358,10 +350,9 @@ FileWriteStore (
|
||||
return Status;
|
||||
}
|
||||
|
||||
STATIC
|
||||
VOID
|
||||
EFIAPI
|
||||
OnVirtualAddressChange (
|
||||
OnVirtualAddressChangeFs (
|
||||
IN EFI_EVENT Event,
|
||||
IN VOID *Context
|
||||
)
|
||||
@@ -375,7 +366,6 @@ OnVirtualAddressChange (
|
||||
EfiConvertPointer (0, (VOID **) &Dev->VarStore.Write);
|
||||
}
|
||||
|
||||
STATIC
|
||||
EFI_STATUS
|
||||
OpenStore (
|
||||
IN EFI_DEVICE_PATH_PROTOCOL *Device,
|
||||
|
@@ -22,22 +22,19 @@ Revision History
|
||||
--*/
|
||||
#include "FSVariable.h"
|
||||
|
||||
STATIC
|
||||
VOID
|
||||
EFIAPI
|
||||
OnVirtualAddressChange (
|
||||
OnVirtualAddressChangeMs (
|
||||
IN EFI_EVENT Event,
|
||||
IN VOID *Context
|
||||
);
|
||||
|
||||
STATIC
|
||||
EFI_STATUS
|
||||
EFIAPI
|
||||
MemEraseStore(
|
||||
IN VARIABLE_STORAGE *This
|
||||
);
|
||||
|
||||
STATIC
|
||||
EFI_STATUS
|
||||
EFIAPI
|
||||
MemWriteStore (
|
||||
@@ -74,15 +71,14 @@ MemStorageConstructor (
|
||||
DEBUG ((EFI_D_ERROR, "VStorage: Size = 0x%x\n", Size));
|
||||
|
||||
*VarStore = &Dev->VarStore;
|
||||
*GoVirtualEvent = OnVirtualAddressChange;
|
||||
*GoVirtualEvent = OnVirtualAddressChangeMs;
|
||||
|
||||
return EFI_SUCCESS;
|
||||
}
|
||||
|
||||
STATIC
|
||||
VOID
|
||||
EFIAPI
|
||||
OnVirtualAddressChange (
|
||||
OnVirtualAddressChangeMs (
|
||||
IN EFI_EVENT Event,
|
||||
IN VOID *Context
|
||||
)
|
||||
@@ -96,7 +92,6 @@ OnVirtualAddressChange (
|
||||
EfiConvertPointer (0, (VOID**)&Dev->VarStore.Write);
|
||||
}
|
||||
|
||||
STATIC
|
||||
EFI_STATUS
|
||||
EFIAPI
|
||||
MemEraseStore(
|
||||
@@ -111,7 +106,6 @@ MemEraseStore(
|
||||
}
|
||||
|
||||
|
||||
STATIC
|
||||
EFI_STATUS
|
||||
EFIAPI
|
||||
MemWriteStore (
|
||||
|
Reference in New Issue
Block a user