OvmfPkg: Apply uncrustify changes
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3737 Apply uncrustify changes to .c/.h files in the OvmfPkg package Cc: Andrew Fish <afish@apple.com> Cc: Leif Lindholm <leif@nuviainc.com> Cc: Michael D Kinney <michael.d.kinney@intel.com> Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com> Reviewed-by: Andrew Fish <afish@apple.com>
This commit is contained in:
committed by
mergify[bot]
parent
d1050b9dff
commit
ac0a286f4d
@@ -56,16 +56,16 @@
|
||||
STATIC
|
||||
EFI_STATUS
|
||||
ValidateInfoStructure (
|
||||
IN UINTN SizeByProtocolCaller,
|
||||
IN UINTN MinimumStructSize,
|
||||
IN BOOLEAN IsSizeByInfoPresent,
|
||||
IN VOID *Buffer
|
||||
IN UINTN SizeByProtocolCaller,
|
||||
IN UINTN MinimumStructSize,
|
||||
IN BOOLEAN IsSizeByInfoPresent,
|
||||
IN VOID *Buffer
|
||||
)
|
||||
{
|
||||
UINTN NameFieldByteOffset;
|
||||
UINTN NameFieldBytes;
|
||||
UINTN NameFieldChar16s;
|
||||
CHAR16 *NameField;
|
||||
UINTN NameFieldByteOffset;
|
||||
UINTN NameFieldBytes;
|
||||
UINTN NameFieldChar16s;
|
||||
CHAR16 *NameField;
|
||||
|
||||
//
|
||||
// Make sure the internal function asking for validation passes in sane
|
||||
@@ -92,7 +92,7 @@ ValidateInfoStructure (
|
||||
// agrees with the protocol caller-provided size.
|
||||
//
|
||||
if (IsSizeByInfoPresent) {
|
||||
UINT64 *SizeByInfo;
|
||||
UINT64 *SizeByInfo;
|
||||
|
||||
SizeByInfo = Buffer;
|
||||
if (*SizeByInfo != SizeByProtocolCaller) {
|
||||
@@ -172,19 +172,18 @@ ValidateInfoStructure (
|
||||
STATIC
|
||||
EFI_STATUS
|
||||
Rename (
|
||||
IN OUT VIRTIO_FS_FILE *VirtioFsFile,
|
||||
IN CHAR16 *NewFileName
|
||||
IN OUT VIRTIO_FS_FILE *VirtioFsFile,
|
||||
IN CHAR16 *NewFileName
|
||||
)
|
||||
{
|
||||
|
||||
VIRTIO_FS *VirtioFs;
|
||||
EFI_STATUS Status;
|
||||
CHAR8 *Destination;
|
||||
BOOLEAN RootEscape;
|
||||
UINT64 OldParentDirNodeId;
|
||||
CHAR8 *OldLastComponent;
|
||||
UINT64 NewParentDirNodeId;
|
||||
CHAR8 *NewLastComponent;
|
||||
VIRTIO_FS *VirtioFs;
|
||||
EFI_STATUS Status;
|
||||
CHAR8 *Destination;
|
||||
BOOLEAN RootEscape;
|
||||
UINT64 OldParentDirNodeId;
|
||||
CHAR8 *OldLastComponent;
|
||||
UINT64 NewParentDirNodeId;
|
||||
CHAR8 *NewLastComponent;
|
||||
|
||||
VirtioFs = VirtioFsFile->OwnerFs;
|
||||
|
||||
@@ -198,21 +197,28 @@ Rename (
|
||||
//
|
||||
return EFI_SUCCESS;
|
||||
}
|
||||
|
||||
return EFI_ACCESS_DENIED;
|
||||
}
|
||||
|
||||
//
|
||||
// Compose the canonical pathname for the destination.
|
||||
//
|
||||
Status = VirtioFsComposeRenameDestination (VirtioFsFile->CanonicalPathname,
|
||||
NewFileName, &Destination, &RootEscape);
|
||||
Status = VirtioFsComposeRenameDestination (
|
||||
VirtioFsFile->CanonicalPathname,
|
||||
NewFileName,
|
||||
&Destination,
|
||||
&RootEscape
|
||||
);
|
||||
if (EFI_ERROR (Status)) {
|
||||
return Status;
|
||||
}
|
||||
|
||||
if (RootEscape) {
|
||||
Status = EFI_NOT_FOUND;
|
||||
goto FreeDestination;
|
||||
}
|
||||
|
||||
//
|
||||
// If the rename would leave VirtioFsFile->CanonicalPathname unchanged, then
|
||||
// EFI_FILE_PROTOCOL.SetInfo() isn't asking for a rename actually.
|
||||
@@ -221,24 +227,29 @@ Rename (
|
||||
Status = EFI_SUCCESS;
|
||||
goto FreeDestination;
|
||||
}
|
||||
|
||||
//
|
||||
// Check if the rename would break the canonical pathnames of other
|
||||
// VIRTIO_FS_FILE instances of the same VIRTIO_FS.
|
||||
//
|
||||
if (VirtioFsFile->IsDirectory) {
|
||||
UINTN PathLen;
|
||||
LIST_ENTRY *OpenFilesEntry;
|
||||
UINTN PathLen;
|
||||
LIST_ENTRY *OpenFilesEntry;
|
||||
|
||||
PathLen = AsciiStrLen (VirtioFsFile->CanonicalPathname);
|
||||
BASE_LIST_FOR_EACH (OpenFilesEntry, &VirtioFs->OpenFiles) {
|
||||
VIRTIO_FS_FILE *OtherFile;
|
||||
VIRTIO_FS_FILE *OtherFile;
|
||||
|
||||
OtherFile = VIRTIO_FS_FILE_FROM_OPEN_FILES_ENTRY (OpenFilesEntry);
|
||||
if (OtherFile != VirtioFsFile &&
|
||||
AsciiStrnCmp (VirtioFsFile->CanonicalPathname,
|
||||
OtherFile->CanonicalPathname, PathLen) == 0 &&
|
||||
(OtherFile->CanonicalPathname[PathLen] == '\0' ||
|
||||
OtherFile->CanonicalPathname[PathLen] == '/')) {
|
||||
if ((OtherFile != VirtioFsFile) &&
|
||||
(AsciiStrnCmp (
|
||||
VirtioFsFile->CanonicalPathname,
|
||||
OtherFile->CanonicalPathname,
|
||||
PathLen
|
||||
) == 0) &&
|
||||
((OtherFile->CanonicalPathname[PathLen] == '\0') ||
|
||||
(OtherFile->CanonicalPathname[PathLen] == '/')))
|
||||
{
|
||||
//
|
||||
// OtherFile refers to the same directory as VirtioFsFile, or is a
|
||||
// (possibly indirect) child of the directory referred to by
|
||||
@@ -249,6 +260,7 @@ Rename (
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//
|
||||
// From this point on, the file needs to be open for writing.
|
||||
//
|
||||
@@ -256,26 +268,41 @@ Rename (
|
||||
Status = EFI_ACCESS_DENIED;
|
||||
goto FreeDestination;
|
||||
}
|
||||
|
||||
//
|
||||
// Split both source and destination canonical pathnames into (most specific
|
||||
// parent directory, last component) pairs.
|
||||
//
|
||||
Status = VirtioFsLookupMostSpecificParentDir (VirtioFs,
|
||||
VirtioFsFile->CanonicalPathname, &OldParentDirNodeId,
|
||||
&OldLastComponent);
|
||||
Status = VirtioFsLookupMostSpecificParentDir (
|
||||
VirtioFs,
|
||||
VirtioFsFile->CanonicalPathname,
|
||||
&OldParentDirNodeId,
|
||||
&OldLastComponent
|
||||
);
|
||||
if (EFI_ERROR (Status)) {
|
||||
goto FreeDestination;
|
||||
}
|
||||
Status = VirtioFsLookupMostSpecificParentDir (VirtioFs, Destination,
|
||||
&NewParentDirNodeId, &NewLastComponent);
|
||||
|
||||
Status = VirtioFsLookupMostSpecificParentDir (
|
||||
VirtioFs,
|
||||
Destination,
|
||||
&NewParentDirNodeId,
|
||||
&NewLastComponent
|
||||
);
|
||||
if (EFI_ERROR (Status)) {
|
||||
goto ForgetOldParentDirNodeId;
|
||||
}
|
||||
|
||||
//
|
||||
// Perform the rename. If the destination path exists, the rename will fail.
|
||||
//
|
||||
Status = VirtioFsFuseRename (VirtioFs, OldParentDirNodeId, OldLastComponent,
|
||||
NewParentDirNodeId, NewLastComponent);
|
||||
Status = VirtioFsFuseRename (
|
||||
VirtioFs,
|
||||
OldParentDirNodeId,
|
||||
OldLastComponent,
|
||||
NewParentDirNodeId,
|
||||
NewLastComponent
|
||||
);
|
||||
if (EFI_ERROR (Status)) {
|
||||
goto ForgetNewParentDirNodeId;
|
||||
}
|
||||
@@ -285,8 +312,8 @@ Rename (
|
||||
//
|
||||
FreePool (VirtioFsFile->CanonicalPathname);
|
||||
VirtioFsFile->CanonicalPathname = Destination;
|
||||
Destination = NULL;
|
||||
Status = EFI_SUCCESS;
|
||||
Destination = NULL;
|
||||
Status = EFI_SUCCESS;
|
||||
|
||||
//
|
||||
// Fall through.
|
||||
@@ -305,6 +332,7 @@ FreeDestination:
|
||||
if (Destination != NULL) {
|
||||
FreePool (Destination);
|
||||
}
|
||||
|
||||
return Status;
|
||||
}
|
||||
|
||||
@@ -332,22 +360,22 @@ FreeDestination:
|
||||
STATIC
|
||||
EFI_STATUS
|
||||
UpdateAttributes (
|
||||
IN OUT VIRTIO_FS_FILE *VirtioFsFile,
|
||||
IN EFI_FILE_INFO *NewFileInfo
|
||||
IN OUT VIRTIO_FS_FILE *VirtioFsFile,
|
||||
IN EFI_FILE_INFO *NewFileInfo
|
||||
)
|
||||
{
|
||||
VIRTIO_FS *VirtioFs;
|
||||
EFI_STATUS Status;
|
||||
VIRTIO_FS_FUSE_ATTRIBUTES_RESPONSE FuseAttr;
|
||||
EFI_FILE_INFO FileInfo;
|
||||
BOOLEAN UpdateFileSize;
|
||||
UINT64 FileSize;
|
||||
BOOLEAN UpdateAtime;
|
||||
BOOLEAN UpdateMtime;
|
||||
UINT64 Atime;
|
||||
UINT64 Mtime;
|
||||
BOOLEAN UpdateMode;
|
||||
UINT32 Mode;
|
||||
VIRTIO_FS *VirtioFs;
|
||||
EFI_STATUS Status;
|
||||
VIRTIO_FS_FUSE_ATTRIBUTES_RESPONSE FuseAttr;
|
||||
EFI_FILE_INFO FileInfo;
|
||||
BOOLEAN UpdateFileSize;
|
||||
UINT64 FileSize;
|
||||
BOOLEAN UpdateAtime;
|
||||
BOOLEAN UpdateMtime;
|
||||
UINT64 Atime;
|
||||
UINT64 Mtime;
|
||||
BOOLEAN UpdateMode;
|
||||
UINT32 Mode;
|
||||
|
||||
VirtioFs = VirtioFsFile->OwnerFs;
|
||||
|
||||
@@ -359,28 +387,44 @@ UpdateAttributes (
|
||||
if (EFI_ERROR (Status)) {
|
||||
return Status;
|
||||
}
|
||||
|
||||
Status = VirtioFsFuseAttrToEfiFileInfo (&FuseAttr, &FileInfo);
|
||||
if (EFI_ERROR (Status)) {
|
||||
return Status;
|
||||
}
|
||||
|
||||
//
|
||||
// Collect the updates.
|
||||
//
|
||||
if (VirtioFsFile->IsDirectory) {
|
||||
UpdateFileSize = FALSE;
|
||||
} else {
|
||||
VirtioFsGetFuseSizeUpdate (&FileInfo, NewFileInfo, &UpdateFileSize,
|
||||
&FileSize);
|
||||
VirtioFsGetFuseSizeUpdate (
|
||||
&FileInfo,
|
||||
NewFileInfo,
|
||||
&UpdateFileSize,
|
||||
&FileSize
|
||||
);
|
||||
}
|
||||
|
||||
Status = VirtioFsGetFuseTimeUpdates (&FileInfo, NewFileInfo, &UpdateAtime,
|
||||
&UpdateMtime, &Atime, &Mtime);
|
||||
Status = VirtioFsGetFuseTimeUpdates (
|
||||
&FileInfo,
|
||||
NewFileInfo,
|
||||
&UpdateAtime,
|
||||
&UpdateMtime,
|
||||
&Atime,
|
||||
&Mtime
|
||||
);
|
||||
if (EFI_ERROR (Status)) {
|
||||
return Status;
|
||||
}
|
||||
|
||||
Status = VirtioFsGetFuseModeUpdate (&FileInfo, NewFileInfo, &UpdateMode,
|
||||
&Mode);
|
||||
Status = VirtioFsGetFuseModeUpdate (
|
||||
&FileInfo,
|
||||
NewFileInfo,
|
||||
&UpdateMode,
|
||||
&Mode
|
||||
);
|
||||
if (EFI_ERROR (Status)) {
|
||||
return Status;
|
||||
}
|
||||
@@ -391,14 +435,17 @@ UpdateAttributes (
|
||||
if (!UpdateFileSize && !UpdateAtime && !UpdateMtime && !UpdateMode) {
|
||||
return EFI_SUCCESS;
|
||||
}
|
||||
|
||||
//
|
||||
// If the file is not open for writing, then only Mode may be updated (for
|
||||
// toggling EFI_FILE_READ_ONLY).
|
||||
//
|
||||
if (!VirtioFsFile->IsOpenForWriting &&
|
||||
(UpdateFileSize || UpdateAtime || UpdateMtime)) {
|
||||
(UpdateFileSize || UpdateAtime || UpdateMtime))
|
||||
{
|
||||
return EFI_ACCESS_DENIED;
|
||||
}
|
||||
|
||||
//
|
||||
// Send the FUSE_SETATTR request now.
|
||||
//
|
||||
@@ -419,14 +466,14 @@ UpdateAttributes (
|
||||
STATIC
|
||||
EFI_STATUS
|
||||
SetFileInfo (
|
||||
IN EFI_FILE_PROTOCOL *This,
|
||||
IN UINTN BufferSize,
|
||||
IN VOID *Buffer
|
||||
IN EFI_FILE_PROTOCOL *This,
|
||||
IN UINTN BufferSize,
|
||||
IN VOID *Buffer
|
||||
)
|
||||
{
|
||||
VIRTIO_FS_FILE *VirtioFsFile;
|
||||
EFI_STATUS Status;
|
||||
EFI_FILE_INFO *FileInfo;
|
||||
VIRTIO_FS_FILE *VirtioFsFile;
|
||||
EFI_STATUS Status;
|
||||
EFI_FILE_INFO *FileInfo;
|
||||
|
||||
VirtioFsFile = VIRTIO_FS_FILE_FROM_SIMPLE_FILE (This);
|
||||
|
||||
@@ -435,14 +482,17 @@ SetFileInfo (
|
||||
//
|
||||
Status = ValidateInfoStructure (
|
||||
BufferSize, // SizeByProtocolCaller
|
||||
OFFSET_OF (EFI_FILE_INFO,
|
||||
FileName) + sizeof (CHAR16), // MinimumStructSize
|
||||
OFFSET_OF (
|
||||
EFI_FILE_INFO,
|
||||
FileName
|
||||
) + sizeof (CHAR16), // MinimumStructSize
|
||||
TRUE, // IsSizeByInfoPresent
|
||||
Buffer
|
||||
);
|
||||
if (EFI_ERROR (Status)) {
|
||||
return Status;
|
||||
}
|
||||
|
||||
FileInfo = Buffer;
|
||||
|
||||
//
|
||||
@@ -452,6 +502,7 @@ SetFileInfo (
|
||||
if (EFI_ERROR (Status)) {
|
||||
return Status;
|
||||
}
|
||||
|
||||
//
|
||||
// Update any attributes requested.
|
||||
//
|
||||
@@ -470,15 +521,15 @@ SetFileInfo (
|
||||
STATIC
|
||||
EFI_STATUS
|
||||
SetFileSystemInfo (
|
||||
IN EFI_FILE_PROTOCOL *This,
|
||||
IN UINTN BufferSize,
|
||||
IN VOID *Buffer
|
||||
IN EFI_FILE_PROTOCOL *This,
|
||||
IN UINTN BufferSize,
|
||||
IN VOID *Buffer
|
||||
)
|
||||
{
|
||||
VIRTIO_FS_FILE *VirtioFsFile;
|
||||
VIRTIO_FS *VirtioFs;
|
||||
EFI_STATUS Status;
|
||||
EFI_FILE_SYSTEM_INFO *FileSystemInfo;
|
||||
VIRTIO_FS_FILE *VirtioFsFile;
|
||||
VIRTIO_FS *VirtioFs;
|
||||
EFI_STATUS Status;
|
||||
EFI_FILE_SYSTEM_INFO *FileSystemInfo;
|
||||
|
||||
VirtioFsFile = VIRTIO_FS_FILE_FROM_SIMPLE_FILE (This);
|
||||
VirtioFs = VirtioFsFile->OwnerFs;
|
||||
@@ -488,14 +539,17 @@ SetFileSystemInfo (
|
||||
//
|
||||
Status = ValidateInfoStructure (
|
||||
BufferSize, // SizeByProtocolCaller
|
||||
OFFSET_OF (EFI_FILE_SYSTEM_INFO,
|
||||
VolumeLabel) + sizeof (CHAR16), // MinimumStructSize
|
||||
OFFSET_OF (
|
||||
EFI_FILE_SYSTEM_INFO,
|
||||
VolumeLabel
|
||||
) + sizeof (CHAR16), // MinimumStructSize
|
||||
TRUE, // IsSizeByInfoPresent
|
||||
Buffer
|
||||
);
|
||||
if (EFI_ERROR (Status)) {
|
||||
return Status;
|
||||
}
|
||||
|
||||
FileSystemInfo = Buffer;
|
||||
|
||||
//
|
||||
@@ -509,6 +563,7 @@ SetFileSystemInfo (
|
||||
if (StrCmp (FileSystemInfo->VolumeLabel, VirtioFs->Label) == 0) {
|
||||
return EFI_SUCCESS;
|
||||
}
|
||||
|
||||
return EFI_WRITE_PROTECTED;
|
||||
}
|
||||
|
||||
@@ -518,15 +573,15 @@ SetFileSystemInfo (
|
||||
STATIC
|
||||
EFI_STATUS
|
||||
SetFileSystemVolumeLabelInfo (
|
||||
IN EFI_FILE_PROTOCOL *This,
|
||||
IN UINTN BufferSize,
|
||||
IN VOID *Buffer
|
||||
IN EFI_FILE_PROTOCOL *This,
|
||||
IN UINTN BufferSize,
|
||||
IN VOID *Buffer
|
||||
)
|
||||
{
|
||||
VIRTIO_FS_FILE *VirtioFsFile;
|
||||
VIRTIO_FS *VirtioFs;
|
||||
EFI_STATUS Status;
|
||||
EFI_FILE_SYSTEM_VOLUME_LABEL *FileSystemVolumeLabel;
|
||||
VIRTIO_FS_FILE *VirtioFsFile;
|
||||
VIRTIO_FS *VirtioFs;
|
||||
EFI_STATUS Status;
|
||||
EFI_FILE_SYSTEM_VOLUME_LABEL *FileSystemVolumeLabel;
|
||||
|
||||
VirtioFsFile = VIRTIO_FS_FILE_FROM_SIMPLE_FILE (This);
|
||||
VirtioFs = VirtioFsFile->OwnerFs;
|
||||
@@ -536,14 +591,17 @@ SetFileSystemVolumeLabelInfo (
|
||||
//
|
||||
Status = ValidateInfoStructure (
|
||||
BufferSize, // SizeByProtocolCaller
|
||||
OFFSET_OF (EFI_FILE_SYSTEM_VOLUME_LABEL,
|
||||
VolumeLabel) + sizeof (CHAR16), // MinimumStructSize
|
||||
OFFSET_OF (
|
||||
EFI_FILE_SYSTEM_VOLUME_LABEL,
|
||||
VolumeLabel
|
||||
) + sizeof (CHAR16), // MinimumStructSize
|
||||
FALSE, // IsSizeByInfoPresent
|
||||
Buffer
|
||||
);
|
||||
if (EFI_ERROR (Status)) {
|
||||
return Status;
|
||||
}
|
||||
|
||||
FileSystemVolumeLabel = Buffer;
|
||||
|
||||
//
|
||||
@@ -554,16 +612,17 @@ SetFileSystemVolumeLabelInfo (
|
||||
if (StrCmp (FileSystemVolumeLabel->VolumeLabel, VirtioFs->Label) == 0) {
|
||||
return EFI_SUCCESS;
|
||||
}
|
||||
|
||||
return EFI_WRITE_PROTECTED;
|
||||
}
|
||||
|
||||
EFI_STATUS
|
||||
EFIAPI
|
||||
VirtioFsSimpleFileSetInfo (
|
||||
IN EFI_FILE_PROTOCOL *This,
|
||||
IN EFI_GUID *InformationType,
|
||||
IN UINTN BufferSize,
|
||||
IN VOID *Buffer
|
||||
IN EFI_FILE_PROTOCOL *This,
|
||||
IN EFI_GUID *InformationType,
|
||||
IN UINTN BufferSize,
|
||||
IN VOID *Buffer
|
||||
)
|
||||
{
|
||||
if (CompareGuid (InformationType, &gEfiFileInfoGuid)) {
|
||||
|
Reference in New Issue
Block a user