summaryrefslogtreecommitdiff
path: root/drm/common/ReadWriteUtils.cpp
diff options
context:
space:
mode:
author Gloria Wang <gwang@google.com> 2010-11-22 10:48:30 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 2010-11-22 10:48:30 -0800
commit83d97c8c7ddff9374f876bef48758414a7775cb1 (patch)
tree8c34611cbbd6c2e84c886ed86d8bed154f39fc33 /drm/common/ReadWriteUtils.cpp
parent18439bee6f8b525abe3f1fac69bc4cea184e1565 (diff)
parent5fc3edb13edb058f14e6550d295ce3e50e5ebf8c (diff)
Merge "64-bit file size/offset support for DRM framework"
Diffstat (limited to 'drm/common/ReadWriteUtils.cpp')
-rw-r--r--drm/common/ReadWriteUtils.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/drm/common/ReadWriteUtils.cpp b/drm/common/ReadWriteUtils.cpp
index 7ec4fa2e00fa..c16214e2eaff 100644
--- a/drm/common/ReadWriteUtils.cpp
+++ b/drm/common/ReadWriteUtils.cpp
@@ -42,7 +42,7 @@ String8 ReadWriteUtils::readBytes(const String8& filePath) {
struct stat sb;
if (fstat(fd, &sb) == 0 && sb.st_size > 0) {
- int length = sb.st_size;
+ off64_t length = sb.st_size;
char* bytes = new char[length];
if (length == read(fd, (void*) bytes, length)) {
string.append(bytes, length);
@@ -57,7 +57,7 @@ String8 ReadWriteUtils::readBytes(const String8& filePath) {
int ReadWriteUtils::readBytes(const String8& filePath, char** buffer) {
FILE* file = NULL;
file = fopen(filePath.string(), "r");
- int length = 0;
+ off64_t length = 0;
if (NULL != file) {
int fd = fileno(file);