MA-6217 H264/MKV:One clip can't seek and subtitle can't displayimx_l5.0.0_1.0.0-ga

Use off64_t to support file larger for 4G
Remove off_t definition as bionic have it defined

Signed-off-by: guoyin.chen <guoyin.chen@freescale.com>

4 files changed, 19 insertions, 19 deletions

diff --git a/src/lowntfs-3g.c b/src/lowntfs-3g.c
index a281da6..6d5a284 100644
--- a/src/lowntfs-3g.c
+++ b/src/lowntfs-3g.c
@@ -1104,7 +1104,7 @@ static void ntfs_fuse_releasedir(fuse_req_t req,
 }
 
 static void ntfs_fuse_readdir(fuse_req_t req, fuse_ino_t ino, size_t size,
-			off_t off __attribute__((unused)),
+			off64_t off __attribute__((unused)),
 			struct fuse_file_info *fi __attribute__((unused)))
 {
 	ntfs_fuse_fill_item_t *first;
@@ -1256,7 +1256,7 @@ static void ntfs_fuse_open(fuse_req_t req, fuse_ino_t ino,
 }
 
 static void ntfs_fuse_read(fuse_req_t req, fuse_ino_t ino, size_t size,
-			off_t offset,
+			off64_t offset,
 			struct fuse_file_info *fi __attribute__((unused)))
 {
 	ntfs_inode *ni = NULL;
@@ -1296,7 +1296,7 @@ static void ntfs_fuse_read(fuse_req_t req, fuse_ino_t ino, size_t size,
 		max_read = ((na->data_size+511) & ~511) + 2;
 	}
 #endif /* HAVE_SETXATTR */
-	if (offset + (off_t)size > max_read) {
+	if (offset + (off64_t)size > max_read) {
 		if (max_read < offset)
 			goto ok;
 		size = max_read - offset;
@@ -1331,7 +1331,7 @@ exit:
 }
 
 static void ntfs_fuse_write(fuse_req_t req, fuse_ino_t ino, const char *buf, 
-			size_t size, off_t offset,
+			size_t size, off64_t offset,
 			struct fuse_file_info *fi __attribute__((unused)))
 {
 	ntfs_inode *ni = NULL;
@@ -1490,9 +1490,9 @@ static int ntfs_fuse_chownmod(struct SECURITY_CONTEXT *scx, fuse_ino_t ino,
 
 static int ntfs_fuse_trunc(struct SECURITY_CONTEXT *scx, fuse_ino_t ino, 
 #if !KERNELPERMS | (POSIXACLS & !KERNELACLS)
-		off_t size, BOOL chkwrite, struct stat *stbuf)
+		off64_t size, BOOL chkwrite, struct stat *stbuf)
 #else
-		off_t size, BOOL chkwrite __attribute__((unused)),
+		off64_t size, BOOL chkwrite __attribute__((unused)),
 		struct stat *stbuf)
 #endif
 {
diff --git a/src/ntfs-3g.c b/src/ntfs-3g.c
index 8919761..1252df1 100644
--- a/src/ntfs-3g.c
+++ b/src/ntfs-3g.c
@@ -1089,7 +1089,7 @@ static int ntfs_fuse_opendir(const char *path,
 #endif
 
 static int ntfs_fuse_readdir(const char *path, void *buf,
-		fuse_fill_dir_t filler, off_t offset __attribute__((unused)),
+		fuse_fill_dir_t filler, off64_t offset __attribute__((unused)),
 		struct fuse_file_info *fi __attribute__((unused)))
 {
 	ntfs_fuse_fill_context_t fill_ctx;
@@ -1189,7 +1189,7 @@ static int ntfs_fuse_open(const char *org_path,
 }
 
 static int ntfs_fuse_read(const char *org_path, char *buf, size_t size,
-		off_t offset, struct fuse_file_info *fi __attribute__((unused)))
+		off64_t offset, struct fuse_file_info *fi __attribute__((unused)))
 {
 	ntfs_inode *ni = NULL;
 	ntfs_attr *na = NULL;
@@ -1225,7 +1225,7 @@ static int ntfs_fuse_read(const char *org_path, char *buf, size_t size,
 		max_read = ((na->data_size+511) & ~511) + 2;
 	}
 #endif /* HAVE_SETXATTR */
-	if (offset + (off_t)size > max_read) {
+	if (offset + (off64_t)size > max_read) {
 		if (max_read < offset)
 			goto ok;
 		size = max_read - offset;
@@ -1259,7 +1259,7 @@ exit:
 }
 
 static int ntfs_fuse_write(const char *org_path, const char *buf, size_t size,
-		off_t offset, struct fuse_file_info *fi __attribute__((unused)))
+		off64_t offset, struct fuse_file_info *fi __attribute__((unused)))
 {
 	ntfs_inode *ni = NULL;
 	ntfs_attr *na = NULL;
@@ -1363,7 +1363,7 @@ out:
  *	Common part for truncate() and ftruncate()
  */
 
-static int ntfs_fuse_trunc(const char *org_path, off_t size,
+static int ntfs_fuse_trunc(const char *org_path, off64_t size,
 #if !KERNELPERMS | (POSIXACLS & !KERNELACLS)
 			BOOL chkwrite)
 #else
@@ -1439,12 +1439,12 @@ exit:
 	return res;
 }
 
-static int ntfs_fuse_truncate(const char *org_path, off_t size)
+static int ntfs_fuse_truncate(const char *org_path, off64_t size)
 {
 	return ntfs_fuse_trunc(org_path, size, TRUE);
 }
 
-static int ntfs_fuse_ftruncate(const char *org_path, off_t size,
+static int ntfs_fuse_ftruncate(const char *org_path, off64_t size,
 			struct fuse_file_info *fi __attribute__((unused)))
 {
 	/*
diff --git a/src/secaudit.c b/src/secaudit.c
index 122d7cf..a05a20b 100644
--- a/src/secaudit.c
+++ b/src/secaudit.c
@@ -447,8 +447,8 @@ void showposix(const struct POSIX_SECURITY*);
 int linux_permissions(const char*, BOOL);
 uid_t linux_owner(const char*);
 gid_t linux_group(const char*);
-int basicread(void*, char*, size_t, off_t);
-int dummyread(void*, char*, size_t, off_t);
+int basicread(void*, char*, size_t, off64_t);
+int dummyread(void*, char*, size_t, off64_t);
 int local_build_mapping(struct MAPPING *[], const char*);
 void newblock(s32);
 void freeblocks(void);
@@ -2113,7 +2113,7 @@ void freeblocks(void)
  */
 
 int basicread(void *fileid, char *buf, size_t size,
-		off_t pos __attribute__((unused)))
+		off64_t pos __attribute__((unused)))
 {
 	return (read(*(int*)fileid, buf, size));
 }
@@ -2125,11 +2125,11 @@ int basicread(void *fileid, char *buf, size_t size,
  */
 
 int dummyread(void *fileid  __attribute__((unused)),
-		char *buf, size_t size, off_t pos)
+		char *buf, size_t size, off64_t pos)
 {
 	size_t sz;
 
-	if (pos >= (off_t)(sizeof(dummymapping) - 1))
+	if (pos >= (off64_t)(sizeof(dummymapping) - 1))
 		sz = 0;
 	else
 		if ((size + pos) >= (sizeof(dummymapping) - 1))
diff --git a/src/secaudit.h b/src/secaudit.h
index 75c8ece..fa114c5 100644
--- a/src/secaudit.h
+++ b/src/secaudit.h
@@ -656,7 +656,7 @@ struct group {
 	gid_t gr_gid;
 } ;
 
-typedef int (*FILEREADER)(void *fileid, char *buf, size_t size, off_t pos);
+typedef int (*FILEREADER)(void *fileid, char *buf, size_t size, off64_t pos);
 
 /*
  *		Data defined in secaudit.c