emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unzip: remove now-pointless lseek which returns current position

Browse Source 
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>
This commit is contained in:
Cristian Ionescu-Idbohrn 2017-01-05 19:07:54 +01:00 committed by Denys Vlasenko
parent ecba2944d5
commit e6add210b2
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
archival/unzip.c
View File

@ -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) static uint32_t read_next_cdf(uint32_t cdf_offset, cdf_header_t *cdf_ptr)
{ {
off_t org;
uint32_t magic; uint32_t magic;
if (cdf_offset == BAD_CDF_OFFSET) if (cdf_offset == BAD_CDF_OFFSET)
return cdf_offset; return cdf_offset;
org = xlseek(zip_fd, 0, SEEK_CUR);
dbg("Reading CDF at 0x%x", (unsigned)cdf_offset); dbg("Reading CDF at 0x%x", (unsigned)cdf_offset);
xlseek(zip_fd, cdf_offset, SEEK_SET); xlseek(zip_fd, cdf_offset, SEEK_SET);
xread(zip_fd, &magic, 4); 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 */ return 0; /* EOF */
} }
xread(zip_fd, cdf_ptr->raw, CDF_HEADER_LEN); 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); FIX_ENDIANNESS_CDF(*cdf_ptr);
dbg(" file_name_length:%u extra_field_length:%u file_comment_length:%u", dbg(" file_name_length:%u extra_field_length:%u file_comment_length:%u",