X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fmake_ext4fs.git;a=blobdiff_plain;f=libsparse%2Fsparse_read.c;h=dd19eb44a025aac26421e7fb331ed92f2eab2ac1;hp=9b10293feff78265be8ea1e567f83b61ef2c13a0;hb=bb9cf91795e1254584bf6a38a070646597724089;hpb=e51257087e6c54d8274548ba26aad43857a75367

diff --git a/libsparse/sparse_read.c b/libsparse/sparse_read.c
index 9b10293..dd19eb4 100644
--- a/libsparse/sparse_read.c
+++ b/libsparse/sparse_read.c
@@ -35,11 +35,6 @@
 #include "sparse_file.h"
 #include "sparse_format.h"
 
-#if defined(__APPLE__) && defined(__MACH__)
-#define lseek64 lseek
-#define off64_t off_t
-#endif
-
 #define SPARSE_HEADER_MAJOR_VER 1
 #define SPARSE_HEADER_LEN       (sizeof(sparse_header_t))
 #define CHUNK_HEADER_LEN (sizeof(chunk_header_t))
@@ -78,12 +73,9 @@ static void verbose_error(bool verbose, int err, const char *fmt, ...)
 		s = " at ";
 	}
 	if (verbose) {
-#ifndef USE_MINGW
 		if (err == -EOVERFLOW) {
 			sparse_print_verbose("EOF while reading file%s%s\n", s, at);
-		} else
-#endif
-		if (err == -EINVAL) {
+		} else if (err == -EINVAL) {
 			sparse_print_verbose("Invalid sparse file format%s%s\n", s, at);
 		} else if (err == -ENOMEM) {
 			sparse_print_verbose("Failed allocation while reading file%s%s\n",
@@ -129,7 +121,7 @@ static int process_raw_chunk(struct sparse_file *s, unsigned int chunk_size,
 			len -= chunk;
 		}
 	} else {
-		lseek64(fd, len, SEEK_CUR);
+		lseek(fd, len, SEEK_CUR);
 	}
 
 	return 0;
@@ -219,7 +211,7 @@ static int process_crc32_chunk(int fd, unsigned int chunk_size, uint32_t crc32)
 	return 0;
 }
 
-static int process_chunk(struct sparse_file *s, int fd, off64_t offset,
+static int process_chunk(struct sparse_file *s, int fd, off_t offset,
 		unsigned int chunk_hdr_sz, chunk_header_t *chunk_header,
 		unsigned int cur_block, uint32_t *crc_ptr)
 {
@@ -280,7 +272,7 @@ static int sparse_file_read_sparse(struct sparse_file *s, int fd, bool crc)
 	uint32_t crc32 = 0;
 	uint32_t *crc_ptr = 0;
 	unsigned int cur_block = 0;
-	off64_t offset;
+	off_t offset;
 
 	if (!copybuf) {
 		copybuf = malloc(COPY_BUF_SIZE);
@@ -319,7 +311,7 @@ static int sparse_file_read_sparse(struct sparse_file *s, int fd, bool crc)
 		/* Skip the remaining bytes in a header that is longer than
 		 * we expected.
 		 */
-		lseek64(fd, sparse_header.file_hdr_sz - SPARSE_HEADER_LEN, SEEK_CUR);
+		lseek(fd, sparse_header.file_hdr_sz - SPARSE_HEADER_LEN, SEEK_CUR);
 	}
 
 	for (i = 0; i < sparse_header.total_chunks; i++) {
@@ -332,10 +324,10 @@ static int sparse_file_read_sparse(struct sparse_file *s, int fd, bool crc)
 			/* Skip the remaining bytes in a header that is longer than
 			 * we expected.
 			 */
-			lseek64(fd, sparse_header.chunk_hdr_sz - CHUNK_HEADER_LEN, SEEK_CUR);
+			lseek(fd, sparse_header.chunk_hdr_sz - CHUNK_HEADER_LEN, SEEK_CUR);
 		}
 
-		offset = lseek64(fd, 0, SEEK_CUR);
+		offset = lseek(fd, 0, SEEK_CUR);
 
 		ret = process_chunk(s, fd, offset, sparse_header.chunk_hdr_sz, &chunk_header,
 				cur_block, crc_ptr);
@@ -454,7 +446,7 @@ struct sparse_file *sparse_file_import(int fd, bool verbose, bool crc)
 		return NULL;
 	}
 
-	ret = lseek64(fd, 0, SEEK_SET);
+	ret = lseek(fd, 0, SEEK_SET);
 	if (ret < 0) {
 		verbose_error(verbose, ret, "seeking");
 		sparse_file_destroy(s);
@@ -483,12 +475,12 @@ struct sparse_file *sparse_file_import_auto(int fd, bool crc, bool verbose)
 		return s;
 	}
 
-	len = lseek64(fd, 0, SEEK_END);
+	len = lseek(fd, 0, SEEK_END);
 	if (len < 0) {
 		return NULL;
 	}
 
-	lseek64(fd, 0, SEEK_SET);
+	lseek(fd, 0, SEEK_SET);
 
 	s = sparse_file_new(4096, len);
 	if (!s) {