File unzip-remove-now-pointless-lseek-which-returns-... of Package busybox-static

Overview Repositories Revisions Requests Users Attributes Meta

File unzip-remove-now-pointless-lseek-which-returns-current-position.patch of Package busybox-static (Revision 1a67f29c0d1df24504dba94b8cad3a58)

Currently displaying revision 1a67f29c0d1df24504dba94b8cad3a58 , Show latest

From: Cristian Ionescu-Idbohrn <cristian.ionescu-idbohrn@axis.com>
Date: Thu Jan 5 19:07:54 2017 +0100
Subject: unzip: remove now-pointless lseek which returns current position
Patch-mainline: e6add210b220bd8fe56ca711279b44e111bdd8f0
Git-repo: https://git.busybox.net/busybox
Git-commit: 8502d410fde43415f23dee3a075366f123ddcc37
References:

archival/unzip.c: In function 'read_next_cdf':
archival/unzip.c:271:8: warning: variable 'org' set but
                                 not used [-Wunused-but-set-variable]
  off_t org;
        ^~~

Signed-off-by: Cristian Ionescu-Idbohrn <cristian.ionescu-idbohrn@axis.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Signed-off-by: Egbert Eich <eich@suse.de>
---
 archival/unzip.c | 5 -----
 1 file changed, 5 deletions(-)
diff --git a/archival/unzip.c b/archival/unzip.c
index edef22f75..35c2ca7eb 100644
--- a/archival/unzip.c
+++ b/archival/unzip.c
@@ -268,13 +268,11 @@ static uint32_t find_cdf_offset(void)
 
 static uint32_t read_next_cdf(uint32_t cdf_offset, cdf_header_t *cdf_ptr)
 {
-	off_t org;
 	uint32_t magic;
 
 	if (cdf_offset == BAD_CDF_OFFSET)
 		return cdf_offset;
 
-	org = xlseek(zip_fd, 0, SEEK_CUR);
 	dbg("Reading CDF at 0x%x", (unsigned)cdf_offset);
 	xlseek(zip_fd, cdf_offset, SEEK_SET);
 	xread(zip_fd, &magic, 4);
@@ -284,9 +282,6 @@ static uint32_t read_next_cdf(uint32_t cdf_offset, cdf_header_t *cdf_ptr)
 		return 0; /* EOF */
 	}
 	xread(zip_fd, cdf_ptr->raw, CDF_HEADER_LEN);
-	/* Caller doesn't need this: */
-	/* dbg("Returning file position to 0x%"OFF_FMT"x", org); */
-	/* xlseek(zip_fd, org, SEEK_SET); */
 
 	FIX_ENDIANNESS_CDF(*cdf_ptr);
 	dbg("  file_name_length:%u extra_field_length:%u file_comment_length:%u",

Places

File unzip-remove-now-pointless-lseek-which-returns-current-position.patch of Package busybox-static (Revision 1a67f29c0d1df24504dba94b8cad3a58)

Places