//\r
// Template for EFI_FILE_SYSTEM_INFO data structure.\r
//\r
-EFI_FILE_SYSTEM_INFO mFsInfoTemplate = {\r
+EFI_FILE_SYSTEM_INFO mFsInfoTemplate = {\r
0, // Populate at runtime\r
TRUE, // Read-only\r
0, // Don't know volume size\r
//\r
// Template for EFI_FILE_PROTOCOL data structure.\r
//\r
-EFI_FILE_PROTOCOL mFileSystemTemplate = {\r
+EFI_FILE_PROTOCOL mFileSystemTemplate = {\r
EFI_FILE_PROTOCOL_REVISION,\r
FvSimpleFileSystemOpen,\r
FvSimpleFileSystemClose,\r
**/\r
EFI_STATUS\r
FvFsFindExecutableSection (\r
- IN EFI_FIRMWARE_VOLUME2_PROTOCOL *FvProtocol,\r
- IN FV_FILESYSTEM_FILE_INFO *FvFileInfo,\r
- IN OUT UINTN *BufferSize,\r
- IN OUT VOID **Buffer\r
+ IN EFI_FIRMWARE_VOLUME2_PROTOCOL *FvProtocol,\r
+ IN FV_FILESYSTEM_FILE_INFO *FvFileInfo,\r
+ IN OUT UINTN *BufferSize,\r
+ IN OUT VOID **Buffer\r
)\r
{\r
- EFI_SECTION_TYPE SectionType;\r
- UINT32 AuthenticationStatus;\r
- EFI_STATUS Status;\r
+ EFI_SECTION_TYPE SectionType;\r
+ UINT32 AuthenticationStatus;\r
+ EFI_STATUS Status;\r
\r
for (SectionType = EFI_SECTION_PE32; SectionType <= EFI_SECTION_TE; SectionType++) {\r
Status = FvProtocol->ReadSection (\r
**/\r
EFI_STATUS\r
FvFsGetFileSize (\r
- IN EFI_FIRMWARE_VOLUME2_PROTOCOL *FvProtocol,\r
- IN OUT FV_FILESYSTEM_FILE_INFO *FvFileInfo\r
+ IN EFI_FIRMWARE_VOLUME2_PROTOCOL *FvProtocol,\r
+ IN OUT FV_FILESYSTEM_FILE_INFO *FvFileInfo\r
)\r
{\r
- UINT32 AuthenticationStatus;\r
- EFI_FV_FILETYPE FoundType;\r
- EFI_FV_FILE_ATTRIBUTES Attributes;\r
- EFI_STATUS Status;\r
- UINT8 IgnoredByte;\r
- VOID *IgnoredPtr;\r
+ UINT32 AuthenticationStatus;\r
+ EFI_FV_FILETYPE FoundType;\r
+ EFI_FV_FILE_ATTRIBUTES Attributes;\r
+ EFI_STATUS Status;\r
+ UINT8 IgnoredByte;\r
+ VOID *IgnoredPtr;\r
\r
//\r
// To get the size of a section, we pass 0 for BufferSize. But we can't pass\r
// can't pass NULL for *Buffer, as that will cause the callee to allocate\r
// a buffer of the sections size.\r
//\r
- IgnoredPtr = &IgnoredByte;\r
+ IgnoredPtr = &IgnoredByte;\r
FvFileInfo->FileInfo.FileSize = 0;\r
\r
if (FV_FILETYPE_IS_EXECUTABLE (FvFileInfo->Type)) {\r
//\r
// Get the size of the first executable section out of the file.\r
//\r
- Status = FvFsFindExecutableSection (FvProtocol, FvFileInfo, (UINTN*)&FvFileInfo->FileInfo.FileSize, &IgnoredPtr);\r
+ Status = FvFsFindExecutableSection (FvProtocol, FvFileInfo, (UINTN *)&FvFileInfo->FileInfo.FileSize, &IgnoredPtr);\r
if (Status == EFI_WARN_BUFFER_TOO_SMALL) {\r
return EFI_SUCCESS;\r
}\r
EFI_SECTION_RAW,\r
0,\r
&IgnoredPtr,\r
- (UINTN*)&FvFileInfo->FileInfo.FileSize,\r
+ (UINTN *)&FvFileInfo->FileInfo.FileSize,\r
&AuthenticationStatus\r
);\r
if (Status == EFI_WARN_BUFFER_TOO_SMALL) {\r
return EFI_SUCCESS;\r
}\r
+\r
if (EFI_ERROR (Status)) {\r
//\r
// Didn't find a raw section, just return the whole file's size.\r
FvProtocol,\r
&FvFileInfo->NameGuid,\r
NULL,\r
- (UINTN*)&FvFileInfo->FileInfo.FileSize,\r
+ (UINTN *)&FvFileInfo->FileInfo.FileSize,\r
&FoundType,\r
&Attributes,\r
&AuthenticationStatus\r
FvProtocol,\r
&FvFileInfo->NameGuid,\r
NULL,\r
- (UINTN*)&FvFileInfo->FileInfo.FileSize,\r
+ (UINTN *)&FvFileInfo->FileInfo.FileSize,\r
&FoundType,\r
&Attributes,\r
&AuthenticationStatus\r
**/\r
EFI_STATUS\r
FvFsReadFile (\r
- IN EFI_FIRMWARE_VOLUME2_PROTOCOL *FvProtocol,\r
- IN FV_FILESYSTEM_FILE_INFO *FvFileInfo,\r
- IN OUT UINTN *BufferSize,\r
- IN OUT VOID **Buffer\r
+ IN EFI_FIRMWARE_VOLUME2_PROTOCOL *FvProtocol,\r
+ IN FV_FILESYSTEM_FILE_INFO *FvFileInfo,\r
+ IN OUT UINTN *BufferSize,\r
+ IN OUT VOID **Buffer\r
)\r
{\r
- UINT32 AuthenticationStatus;\r
- EFI_FV_FILETYPE FoundType;\r
- EFI_FV_FILE_ATTRIBUTES Attributes;\r
- EFI_STATUS Status;\r
+ UINT32 AuthenticationStatus;\r
+ EFI_FV_FILETYPE FoundType;\r
+ EFI_FV_FILE_ATTRIBUTES Attributes;\r
+ EFI_STATUS Status;\r
\r
if (FV_FILETYPE_IS_EXECUTABLE (FvFileInfo->Type)) {\r
//\r
**/\r
EFI_STATUS\r
FvFsGetFileInfo (\r
- IN FV_FILESYSTEM_FILE_INFO *FvFileInfo,\r
- IN OUT UINTN *BufferSize,\r
- OUT EFI_FILE_INFO *FileInfo\r
+ IN FV_FILESYSTEM_FILE_INFO *FvFileInfo,\r
+ IN OUT UINTN *BufferSize,\r
+ OUT EFI_FILE_INFO *FileInfo\r
)\r
{\r
- UINTN InfoSize;\r
+ UINTN InfoSize;\r
\r
InfoSize = (UINTN)FvFileInfo->FileInfo.Size;\r
if (*BufferSize < InfoSize) {\r
BOOLEAN\r
EFIAPI\r
RemoveLastItemFromPath (\r
- IN OUT CHAR16 *Path\r
+ IN OUT CHAR16 *Path\r
)\r
{\r
- CHAR16 *Walker;\r
- CHAR16 *LastSlash;\r
+ CHAR16 *Walker;\r
+ CHAR16 *LastSlash;\r
+\r
//\r
// get directory name from path... ('chop' off extra)\r
//\r
for ( Walker = Path, LastSlash = NULL\r
- ; Walker != NULL && *Walker != CHAR_NULL\r
- ; Walker++\r
- ){\r
- if (*Walker == L'\\' && *(Walker + 1) != CHAR_NULL) {\r
+ ; Walker != NULL && *Walker != CHAR_NULL\r
+ ; Walker++\r
+ )\r
+ {\r
+ if ((*Walker == L'\\') && (*(Walker + 1) != CHAR_NULL)) {\r
LastSlash = Walker + 1;\r
}\r
}\r
@return Path in all other instances.\r
\r
**/\r
-CHAR16*\r
+CHAR16 *\r
EFIAPI\r
TrimFilePathToAbsolutePath (\r
- IN CHAR16 *Path\r
+ IN CHAR16 *Path\r
)\r
{\r
CHAR16 *TempString;\r
//\r
// Fix up the '/' vs '\'\r
//\r
- for (TempString = Path ; (TempString != NULL) && (*TempString != CHAR_NULL); TempString++) {\r
+ for (TempString = Path; (TempString != NULL) && (*TempString != CHAR_NULL); TempString++) {\r
if (*TempString == L'/') {\r
*TempString = L'\\';\r
}\r
// Fix up the ..\r
//\r
while ((TempString = StrStr (Path, L"\\..\\")) != NULL) {\r
- *TempString = CHAR_NULL;\r
- TempString += 4;\r
+ *TempString = CHAR_NULL;\r
+ TempString += 4;\r
RemoveLastItemFromPath (Path);\r
- TempSize = StrSize (TempString);\r
+ TempSize = StrSize (TempString);\r
CopyMem (Path + StrLen (Path), TempString, TempSize);\r
}\r
\r
if (((TempString = StrStr (Path, L"\\..")) != NULL) && (*(TempString + 3) == CHAR_NULL)) {\r
- *TempString = CHAR_NULL;\r
+ *TempString = CHAR_NULL;\r
RemoveLastItemFromPath (Path);\r
}\r
\r
// Fix up the .\r
//\r
while ((TempString = StrStr (Path, L"\\.\\")) != NULL) {\r
- *TempString = CHAR_NULL;\r
- TempString += 2;\r
- TempSize = StrSize (TempString);\r
- CopyMem(Path + StrLen (Path), TempString, TempSize);\r
+ *TempString = CHAR_NULL;\r
+ TempString += 2;\r
+ TempSize = StrSize (TempString);\r
+ CopyMem (Path + StrLen (Path), TempString, TempSize);\r
}\r
\r
if (((TempString = StrStr (Path, L"\\.")) != NULL) && (*(TempString + 2) == CHAR_NULL)) {\r
}\r
\r
while ((TempString = StrStr (Path, L"\\\\")) != NULL) {\r
- *TempString = CHAR_NULL;\r
- TempString += 1;\r
- TempSize = StrSize(TempString);\r
- CopyMem(Path + StrLen(Path), TempString, TempSize);\r
+ *TempString = CHAR_NULL;\r
+ TempString += 1;\r
+ TempSize = StrSize (TempString);\r
+ CopyMem (Path + StrLen (Path), TempString, TempSize);\r
}\r
\r
- if (((TempString = StrStr(Path, L"\\\\")) != NULL) && (*(TempString + 1) == CHAR_NULL)) {\r
+ if (((TempString = StrStr (Path, L"\\\\")) != NULL) && (*(TempString + 1) == CHAR_NULL)) {\r
*(TempString) = CHAR_NULL;\r
}\r
\r
EFI_STATUS\r
EFIAPI\r
FvSimpleFileSystemOpen (\r
- IN EFI_FILE_PROTOCOL *This,\r
- OUT EFI_FILE_PROTOCOL **NewHandle,\r
- IN CHAR16 *FileName,\r
- IN UINT64 OpenMode,\r
- IN UINT64 Attributes\r
+ IN EFI_FILE_PROTOCOL *This,\r
+ OUT EFI_FILE_PROTOCOL **NewHandle,\r
+ IN CHAR16 *FileName,\r
+ IN UINT64 OpenMode,\r
+ IN UINT64 Attributes\r
)\r
{\r
- FV_FILESYSTEM_INSTANCE *Instance;\r
- FV_FILESYSTEM_FILE *File;\r
- FV_FILESYSTEM_FILE *NewFile;\r
- FV_FILESYSTEM_FILE_INFO *FvFileInfo;\r
- LIST_ENTRY *FvFileInfoLink;\r
- EFI_STATUS Status;\r
- UINTN FileNameLength;\r
- UINTN NewFileNameLength;\r
- CHAR16 *FileNameWithExtension;\r
+ FV_FILESYSTEM_INSTANCE *Instance;\r
+ FV_FILESYSTEM_FILE *File;\r
+ FV_FILESYSTEM_FILE *NewFile;\r
+ FV_FILESYSTEM_FILE_INFO *FvFileInfo;\r
+ LIST_ENTRY *FvFileInfoLink;\r
+ EFI_STATUS Status;\r
+ UINTN FileNameLength;\r
+ UINTN NewFileNameLength;\r
+ CHAR16 *FileNameWithExtension;\r
\r
//\r
// Check for a valid mode\r
//\r
switch (OpenMode) {\r
- case EFI_FILE_MODE_READ:\r
- break;\r
+ case EFI_FILE_MODE_READ:\r
+ break;\r
\r
- default:\r
- return EFI_WRITE_PROTECTED;\r
+ default:\r
+ return EFI_WRITE_PROTECTED;\r
}\r
\r
- File = FVFS_FILE_FROM_FILE_THIS (This);\r
+ File = FVFS_FILE_FROM_FILE_THIS (This);\r
Instance = File->Instance;\r
\r
FileName = TrimFilePathToAbsolutePath (FileName);\r
//\r
// Check for opening root\r
//\r
- if (StrCmp (FileName, L".") == 0 || StrCmp (FileName, L"") == 0) {\r
+ if ((StrCmp (FileName, L".") == 0) || (StrCmp (FileName, L"") == 0)) {\r
NewFile = AllocateZeroPool (sizeof (FV_FILESYSTEM_FILE));\r
if (NewFile == NULL) {\r
return EFI_OUT_OF_RESOURCES;\r
}\r
- NewFile->Signature = FVFS_FILE_SIGNATURE;\r
- NewFile->Instance = Instance;\r
+\r
+ NewFile->Signature = FVFS_FILE_SIGNATURE;\r
+ NewFile->Instance = Instance;\r
NewFile->FvFileInfo = File->FvFileInfo;\r
CopyMem (&NewFile->FileProtocol, &mFileSystemTemplate, sizeof (mFileSystemTemplate));\r
InitializeListHead (&NewFile->Link);\r
Status = EFI_NOT_FOUND;\r
FvFileInfo = NULL;\r
for (FvFileInfoLink = GetFirstNode (&Instance->FileInfoHead);\r
- !IsNull (&Instance->FileInfoHead, FvFileInfoLink);\r
- FvFileInfoLink = GetNextNode (&Instance->FileInfoHead, FvFileInfoLink)) {\r
+ !IsNull (&Instance->FileInfoHead, FvFileInfoLink);\r
+ FvFileInfoLink = GetNextNode (&Instance->FileInfoHead, FvFileInfoLink))\r
+ {\r
FvFileInfo = FVFS_FILE_INFO_FROM_LINK (FvFileInfoLink);\r
if (mUnicodeCollation->StriColl (mUnicodeCollation, &FvFileInfo->FileInfo.FileName[0], FileName) == 0) {\r
Status = EFI_SUCCESS;\r
if (mUnicodeCollation->StriColl (mUnicodeCollation, FileName + FileNameLength - 4, L".efi") != 0) {\r
// No, there was no extension. So add one and search again for the file\r
// NewFileNameLength = FileNameLength + 1 + 4 = (Number of non-null character) + (file extension) + (a null character)\r
- NewFileNameLength = FileNameLength + 1 + 4;\r
+ NewFileNameLength = FileNameLength + 1 + 4;\r
FileNameWithExtension = AllocatePool (NewFileNameLength * 2);\r
StrCpyS (FileNameWithExtension, NewFileNameLength, FileName);\r
StrCatS (FileNameWithExtension, NewFileNameLength, L".EFI");\r
\r
for (FvFileInfoLink = GetFirstNode (&Instance->FileInfoHead);\r
- !IsNull (&Instance->FileInfoHead, FvFileInfoLink);\r
- FvFileInfoLink = GetNextNode (&Instance->FileInfoHead, FvFileInfoLink)) {\r
+ !IsNull (&Instance->FileInfoHead, FvFileInfoLink);\r
+ FvFileInfoLink = GetNextNode (&Instance->FileInfoHead, FvFileInfoLink))\r
+ {\r
FvFileInfo = FVFS_FILE_INFO_FROM_LINK (FvFileInfoLink);\r
if (mUnicodeCollation->StriColl (mUnicodeCollation, &FvFileInfo->FileInfo.FileName[0], FileNameWithExtension) == 0) {\r
Status = EFI_SUCCESS;\r
return EFI_OUT_OF_RESOURCES;\r
}\r
\r
- NewFile->Signature = FVFS_FILE_SIGNATURE;\r
- NewFile->Instance = Instance;\r
+ NewFile->Signature = FVFS_FILE_SIGNATURE;\r
+ NewFile->Instance = Instance;\r
NewFile->FvFileInfo = FvFileInfo;\r
CopyMem (&NewFile->FileProtocol, &mFileSystemTemplate, sizeof (mFileSystemTemplate));\r
InitializeListHead (&NewFile->Link);\r
IN EFI_FILE_PROTOCOL *This\r
)\r
{\r
- FV_FILESYSTEM_INSTANCE *Instance;\r
- FV_FILESYSTEM_FILE *File;\r
+ FV_FILESYSTEM_INSTANCE *Instance;\r
+ FV_FILESYSTEM_FILE *File;\r
\r
- File = FVFS_FILE_FROM_FILE_THIS (This);\r
+ File = FVFS_FILE_FROM_FILE_THIS (This);\r
Instance = File->Instance;\r
\r
if (File != Instance->Root) {\r
RemoveEntryList (&File->Link);\r
FreePool (File);\r
}\r
+\r
return EFI_SUCCESS;\r
}\r
\r
EFI_STATUS\r
EFIAPI\r
FvSimpleFileSystemRead (\r
- IN EFI_FILE_PROTOCOL *This,\r
- IN OUT UINTN *BufferSize,\r
- OUT VOID *Buffer\r
+ IN EFI_FILE_PROTOCOL *This,\r
+ IN OUT UINTN *BufferSize,\r
+ OUT VOID *Buffer\r
)\r
{\r
- FV_FILESYSTEM_INSTANCE *Instance;\r
- FV_FILESYSTEM_FILE *File;\r
- EFI_STATUS Status;\r
- LIST_ENTRY *FvFileInfoLink;\r
- VOID *FileBuffer;\r
- UINTN FileSize;\r
-\r
- File = FVFS_FILE_FROM_FILE_THIS (This);\r
+ FV_FILESYSTEM_INSTANCE *Instance;\r
+ FV_FILESYSTEM_FILE *File;\r
+ EFI_STATUS Status;\r
+ LIST_ENTRY *FvFileInfoLink;\r
+ VOID *FileBuffer;\r
+ UINTN FileSize;\r
+\r
+ File = FVFS_FILE_FROM_FILE_THIS (This);\r
Instance = File->Instance;\r
\r
if (File->FvFileInfo == Instance->Root->FvFileInfo) {\r
File->DirReadNext = FVFS_FILE_INFO_FROM_LINK (FvFileInfoLink);\r
}\r
}\r
+\r
return Status;\r
} else {\r
//\r
*BufferSize = (UINTN)(FileSize - File->Position);\r
}\r
\r
- CopyMem (Buffer, (UINT8*)FileBuffer + File->Position, *BufferSize);\r
+ CopyMem (Buffer, (UINT8 *)FileBuffer + File->Position, *BufferSize);\r
File->Position += *BufferSize;\r
\r
FreePool (FileBuffer);\r
EFI_STATUS\r
EFIAPI\r
FvSimpleFileSystemWrite (\r
- IN EFI_FILE_PROTOCOL *This,\r
- IN OUT UINTN *BufferSize,\r
- IN VOID *Buffer\r
+ IN EFI_FILE_PROTOCOL *This,\r
+ IN OUT UINTN *BufferSize,\r
+ IN VOID *Buffer\r
)\r
{\r
- FV_FILESYSTEM_INSTANCE *Instance;\r
- FV_FILESYSTEM_FILE *File;\r
+ FV_FILESYSTEM_INSTANCE *Instance;\r
+ FV_FILESYSTEM_FILE *File;\r
\r
- File = FVFS_FILE_FROM_FILE_THIS (This);\r
+ File = FVFS_FILE_FROM_FILE_THIS (This);\r
Instance = File->Instance;\r
\r
if (File->FvFileInfo == Instance->Root->FvFileInfo) {\r
EFI_STATUS\r
EFIAPI\r
FvSimpleFileSystemGetPosition (\r
- IN EFI_FILE_PROTOCOL *This,\r
- OUT UINT64 *Position\r
+ IN EFI_FILE_PROTOCOL *This,\r
+ OUT UINT64 *Position\r
)\r
{\r
- FV_FILESYSTEM_INSTANCE *Instance;\r
- FV_FILESYSTEM_FILE *File;\r
+ FV_FILESYSTEM_INSTANCE *Instance;\r
+ FV_FILESYSTEM_FILE *File;\r
\r
- File = FVFS_FILE_FROM_FILE_THIS (This);\r
+ File = FVFS_FILE_FROM_FILE_THIS (This);\r
Instance = File->Instance;\r
\r
if (File->FvFileInfo == Instance->Root->FvFileInfo) {\r
EFI_STATUS\r
EFIAPI\r
FvSimpleFileSystemSetPosition (\r
- IN EFI_FILE_PROTOCOL *This,\r
- IN UINT64 Position\r
+ IN EFI_FILE_PROTOCOL *This,\r
+ IN UINT64 Position\r
)\r
{\r
- FV_FILESYSTEM_INSTANCE *Instance;\r
- FV_FILESYSTEM_FILE *File;\r
+ FV_FILESYSTEM_INSTANCE *Instance;\r
+ FV_FILESYSTEM_FILE *File;\r
\r
- File = FVFS_FILE_FROM_FILE_THIS (This);\r
+ File = FVFS_FILE_FROM_FILE_THIS (This);\r
Instance = File->Instance;\r
\r
if (File->FvFileInfo == Instance->Root->FvFileInfo) {\r
if (Position != 0) {\r
return EFI_UNSUPPORTED;\r
}\r
+\r
//\r
// Reset directory position to first entry\r
//\r
EFI_STATUS\r
EFIAPI\r
FvSimpleFileSystemDelete (\r
- IN EFI_FILE_PROTOCOL *This\r
+ IN EFI_FILE_PROTOCOL *This\r
)\r
{\r
- EFI_STATUS Status;\r
+ EFI_STATUS Status;\r
\r
Status = FvSimpleFileSystemClose (This);\r
ASSERT_EFI_ERROR (Status);\r
EFI_STATUS\r
EFIAPI\r
FvSimpleFileSystemGetInfo (\r
- IN EFI_FILE_PROTOCOL *This,\r
- IN EFI_GUID *InformationType,\r
- IN OUT UINTN *BufferSize,\r
- OUT VOID *Buffer\r
+ IN EFI_FILE_PROTOCOL *This,\r
+ IN EFI_GUID *InformationType,\r
+ IN OUT UINTN *BufferSize,\r
+ OUT VOID *Buffer\r
)\r
{\r
- FV_FILESYSTEM_FILE *File;\r
- EFI_FILE_SYSTEM_INFO *FsInfoOut;\r
- EFI_FILE_SYSTEM_VOLUME_LABEL *FsVolumeLabel;\r
- FV_FILESYSTEM_INSTANCE *Instance;\r
- UINTN Size;\r
- EFI_STATUS Status;\r
+ FV_FILESYSTEM_FILE *File;\r
+ EFI_FILE_SYSTEM_INFO *FsInfoOut;\r
+ EFI_FILE_SYSTEM_VOLUME_LABEL *FsVolumeLabel;\r
+ FV_FILESYSTEM_INSTANCE *Instance;\r
+ UINTN Size;\r
+ EFI_STATUS Status;\r
\r
File = FVFS_FILE_FROM_FILE_THIS (This);\r
\r
//\r
// Cast output buffer for convenience\r
//\r
- FsInfoOut = (EFI_FILE_SYSTEM_INFO *) Buffer;\r
+ FsInfoOut = (EFI_FILE_SYSTEM_INFO *)Buffer;\r
\r
CopyMem (FsInfoOut, &mFsInfoTemplate, sizeof (EFI_FILE_SYSTEM_INFO));\r
- Status = StrnCpyS ( FsInfoOut->VolumeLabel,\r
- (*BufferSize - OFFSET_OF (EFI_FILE_SYSTEM_INFO, VolumeLabel)) / sizeof (CHAR16),\r
- Instance->VolumeLabel,\r
- StrLen (Instance->VolumeLabel)\r
- );\r
+ Status = StrnCpyS (\r
+ FsInfoOut->VolumeLabel,\r
+ (*BufferSize - OFFSET_OF (EFI_FILE_SYSTEM_INFO, VolumeLabel)) / sizeof (CHAR16),\r
+ Instance->VolumeLabel,\r
+ StrLen (Instance->VolumeLabel)\r
+ );\r
ASSERT_EFI_ERROR (Status);\r
FsInfoOut->Size = Size;\r
return Status;\r
//\r
// Return file info\r
//\r
- return FvFsGetFileInfo (File->FvFileInfo, BufferSize, (EFI_FILE_INFO *) Buffer);\r
+ return FvFsGetFileInfo (File->FvFileInfo, BufferSize, (EFI_FILE_INFO *)Buffer);\r
} else if (CompareGuid (InformationType, &gEfiFileSystemVolumeLabelInfoIdGuid)) {\r
//\r
// Return Volume Label\r
//\r
Instance = File->Instance;\r
- Size = sizeof (EFI_FILE_SYSTEM_VOLUME_LABEL) + StrSize (Instance->VolumeLabel) - sizeof (CHAR16);;\r
+ Size = sizeof (EFI_FILE_SYSTEM_VOLUME_LABEL) + StrSize (Instance->VolumeLabel) - sizeof (CHAR16);\r
if (*BufferSize < Size) {\r
*BufferSize = Size;\r
return EFI_BUFFER_TOO_SMALL;\r
}\r
\r
- FsVolumeLabel = (EFI_FILE_SYSTEM_VOLUME_LABEL*) Buffer;\r
- Status = StrnCpyS (FsVolumeLabel->VolumeLabel,\r
- (*BufferSize - OFFSET_OF (EFI_FILE_SYSTEM_VOLUME_LABEL, VolumeLabel)) / sizeof (CHAR16),\r
- Instance->VolumeLabel,\r
- StrLen (Instance->VolumeLabel)\r
- );\r
+ FsVolumeLabel = (EFI_FILE_SYSTEM_VOLUME_LABEL *)Buffer;\r
+ Status = StrnCpyS (\r
+ FsVolumeLabel->VolumeLabel,\r
+ (*BufferSize - OFFSET_OF (EFI_FILE_SYSTEM_VOLUME_LABEL, VolumeLabel)) / sizeof (CHAR16),\r
+ Instance->VolumeLabel,\r
+ StrLen (Instance->VolumeLabel)\r
+ );\r
ASSERT_EFI_ERROR (Status);\r
return Status;\r
} else {\r
EFI_STATUS\r
EFIAPI\r
FvSimpleFileSystemSetInfo (\r
- IN EFI_FILE_PROTOCOL *This,\r
- IN EFI_GUID *InformationType,\r
- IN UINTN BufferSize,\r
- IN VOID *Buffer\r
+ IN EFI_FILE_PROTOCOL *This,\r
+ IN EFI_GUID *InformationType,\r
+ IN UINTN BufferSize,\r
+ IN VOID *Buffer\r
)\r
{\r
if (CompareGuid (InformationType, &gEfiFileSystemInfoGuid) ||\r
CompareGuid (InformationType, &gEfiFileInfoGuid) ||\r
- CompareGuid (InformationType, &gEfiFileSystemVolumeLabelInfoIdGuid)) {\r
+ CompareGuid (InformationType, &gEfiFileSystemVolumeLabelInfoIdGuid))\r
+ {\r
return EFI_WRITE_PROTECTED;\r
}\r
\r
return EFI_UNSUPPORTED;\r
}\r
-\r
projects / mirror_edk2.git / blobdiff