From: Tim Kientzle <kientzle@gmail.com>
Date: Sun, 20 Nov 2011 22:21:15 +0000 (-0500)
Subject: Issue 195: Remove a redundant variable.
X-Git-Tag: v3.0.1b~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4fdb02031e9622c8a0f7161878fbfac46fa495e1;p=thirdparty%2Flibarchive.git

Issue 195: Remove a redundant variable.

SVN-Revision: 3814
---

diff --git a/libarchive/archive_read_support_format_iso9660.c b/libarchive/archive_read_support_format_iso9660.c
index 8c742f880..3b97b6454 100644
--- a/libarchive/archive_read_support_format_iso9660.c
+++ b/libarchive/archive_read_support_format_iso9660.c
@@ -490,7 +490,6 @@ archive_read_format_iso9660_bid(struct archive_read *a)
 {
 	struct iso9660 *iso9660;
 	ssize_t bytes_read;
-	const void *h;
 	const unsigned char *p;
 	int seenTerminator;
 
@@ -502,12 +501,11 @@ archive_read_format_iso9660_bid(struct archive_read *a)
 	 * if the I/O layer gives us more, we'll take it.
 	 */
 #define RESERVED_AREA	(SYSTEM_AREA_BLOCK * LOGICAL_BLOCK_SIZE)
-	h = __archive_read_ahead(a,
+	p = __archive_read_ahead(a,
 	    RESERVED_AREA + 8 * LOGICAL_BLOCK_SIZE,
 	    &bytes_read);
-	if (h == NULL)
+	if (p == NULL)
 	    return (-1);
-	p = (const unsigned char *)h;
 
 	/* Skip the reserved area. */
 	bytes_read -= RESERVED_AREA;