From: Dandan Bi <dandan.bi@intel.com>
To: edk2-devel@lists.01.org
Cc: Eric Dong <eric.dong@intel.com>,
Paulo Alcantara <pcacjr@zytor.com>, Ruiyu Ni <ruiyu.ni@intel.com>,
Star Zeng <star.zeng@intel.com>
Subject: [PATCH v2 3/3] MdeModulePkg/UdfDxe: Add type cast to fix build failure in VS tools
Date: Mon, 11 Sep 2017 14:17:03 +0800 [thread overview]
Message-ID: <1505110623-381040-3-git-send-email-dandan.bi@intel.com> (raw)
In-Reply-To: <1505110623-381040-1-git-send-email-dandan.bi@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Cc: Paulo Alcantara <pcacjr@zytor.com>
Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Dandan Bi <dandan.bi@intel.com>
---
.../Universal/Disk/UdfDxe/FileSystemOperations.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/MdeModulePkg/Universal/Disk/UdfDxe/FileSystemOperations.c b/MdeModulePkg/Universal/Disk/UdfDxe/FileSystemOperations.c
index ea3f5fb..bf33ae4 100644
--- a/MdeModulePkg/Universal/Disk/UdfDxe/FileSystemOperations.c
+++ b/MdeModulePkg/Universal/Disk/UdfDxe/FileSystemOperations.c
@@ -477,11 +477,11 @@ DuplicateFid (
OUT UDF_FILE_IDENTIFIER_DESCRIPTOR **NewFileIdentifierDesc
)
{
*NewFileIdentifierDesc =
(UDF_FILE_IDENTIFIER_DESCRIPTOR *)AllocateCopyPool (
- GetFidDescriptorLength (FileIdentifierDesc), FileIdentifierDesc);
+ (UINTN) GetFidDescriptorLength (FileIdentifierDesc), FileIdentifierDesc);
}
//
// Duplicate either a given File Entry or a given Extended File Entry.
//
@@ -814,20 +814,20 @@ GetAedAdsData (
}
//
// Allocate buffer to read in AED's data.
//
- *Data = AllocatePool (*Length);
+ *Data = AllocatePool ((UINTN) (*Length));
if (*Data == NULL) {
return EFI_OUT_OF_RESOURCES;
}
return DiskIo->ReadDisk (
DiskIo,
BlockIo->Media->MediaId,
Offset,
- *Length,
+ (UINTN) (*Length),
*Data
);
}
//
@@ -849,11 +849,11 @@ GrowUpBufferToNextAd (
*Buffer = AllocatePool (ExtentLength);
if (*Buffer == NULL) {
return EFI_OUT_OF_RESOURCES;
}
} else {
- *Buffer = ReallocatePool (Length, Length + ExtentLength, *Buffer);
+ *Buffer = ReallocatePool ((UINTN) Length, (UINTN) (Length + ExtentLength), *Buffer);
if (*Buffer == NULL) {
return EFI_OUT_OF_RESOURCES;
}
}
@@ -938,29 +938,29 @@ ReadFile (
ReadFileInfo->ReadLength = Length;
} else if (ReadFileInfo->Flags == READ_FILE_ALLOCATE_AND_READ) {
//
// Allocate buffer for starting read data.
//
- ReadFileInfo->FileData = AllocatePool (Length);
+ ReadFileInfo->FileData = AllocatePool ((UINTN) Length);
if (ReadFileInfo->FileData == NULL) {
return EFI_OUT_OF_RESOURCES;
}
//
// Read all inline data into ReadFileInfo->FileData
//
- CopyMem (ReadFileInfo->FileData, Data, Length);
+ CopyMem (ReadFileInfo->FileData, Data, (UINTN) Length);
ReadFileInfo->ReadLength = Length;
} else if (ReadFileInfo->Flags == READ_FILE_SEEK_AND_READ) {
//
// If FilePosition is non-zero, seek file to FilePosition, read
// FileDataSize bytes and then updates FilePosition.
//
CopyMem (
ReadFileInfo->FileData,
(VOID *)((UINT8 *)Data + ReadFileInfo->FilePosition),
- ReadFileInfo->FileDataSize
+ (UINTN) ReadFileInfo->FileDataSize
);
ReadFileInfo->FilePosition += ReadFileInfo->FileDataSize;
} else {
ASSERT (FALSE);
@@ -1081,11 +1081,11 @@ ReadFile (
}
if (FilePosition + ExtentLength > ReadFileInfo->FilePosition) {
Offset = ReadFileInfo->FilePosition - FilePosition;
if (Offset < 0) {
- Offset = -(Offset);
+ Offset = - (INT64) (Offset);
}
} else {
Offset = 0;
}
@@ -1109,11 +1109,11 @@ ReadFile (
//
Status = DiskIo->ReadDisk (
DiskIo,
BlockIo->Media->MediaId,
Offset + MultU64x32 (Lsn, LogicalBlockSize),
- DataLength,
+ (UINTN) DataLength,
(VOID *)((UINT8 *)ReadFileInfo->FileData +
DataOffset)
);
if (EFI_ERROR (Status)) {
goto Error_Read_Disk_Blk;
--
1.9.5.msysgit.1
next prev parent reply other threads:[~2017-09-11 6:14 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-11 6:17 [PATCH v2 1/3] MdeModulePkg/PartitionDxe: Initialize the array after declaration Dandan Bi
2017-09-11 6:17 ` [PATCH v2 2/3] MdeModulePkg/UdfDxe: " Dandan Bi
2017-09-11 6:17 ` Dandan Bi [this message]
2017-09-12 9:39 ` [PATCH v2 3/3] MdeModulePkg/UdfDxe: Add type cast to fix build failure in VS tools Zeng, Star
2017-09-12 13:02 ` Paulo Alcantara
2017-09-13 3:31 ` Zeng, Star
2017-09-13 4:06 ` Paulo Alcantara
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1505110623-381040-3-git-send-email-dandan.bi@intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox