From: Tim Kientzle <kientzle@acm.org>
Date: Fri, 23 Mar 2012 06:27:24 +0000 (-0700)
Subject: Fix a compiler warning about redundant 'r' declaration.
X-Git-Tag: v3.0.4~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38614d54c42249c694e6ed93d5e969b41042c0be;p=thirdparty%2Flibarchive.git

Fix a compiler warning about redundant 'r' declaration.
---

diff --git a/libarchive/archive_read_support_format_cab.c b/libarchive/archive_read_support_format_cab.c
index 23d9ee72e..30d844b67 100644
--- a/libarchive/archive_read_support_format_cab.c
+++ b/libarchive/archive_read_support_format_cab.c
@@ -1031,7 +1031,7 @@ archive_read_format_cab_read_data(struct archive_read *a,
 	if (cab->read_data_invoked == 0) {
 		if (cab->bytes_skipped) {
 			if (cab->entry_cfdata == NULL) {
-				int r = cab_next_cfdata(a);
+				r = cab_next_cfdata(a);
 				if (r < 0)
 					return (r);
 			}