]> git.ipfire.org Git - thirdparty/libarchive.git/commitdiff
Issue 195: Remove a redundant variable.
authorTim Kientzle <kientzle@gmail.com>
Sun, 20 Nov 2011 22:21:15 +0000 (17:21 -0500)
committerTim Kientzle <kientzle@gmail.com>
Sun, 20 Nov 2011 22:21:15 +0000 (17:21 -0500)
SVN-Revision: 3814

libarchive/archive_read_support_format_iso9660.c

index 8c742f880be7ed7f1bf2ab425d7f1301ac2fe385..3b97b6454beabfc0c0e17617e4c6a63222f7510b 100644 (file)
@@ -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;