From: Tim Kientzle <kientzle@acm.org>
Date: Fri, 1 Jan 2016 22:25:16 +0000 (-0800)
Subject: Issue #631:  Move 'r' into an inner scope to fix shadowing
X-Git-Tag: v3.1.900a~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c7b323e95d4f62c7828fcf7ced1616b60748a901;p=thirdparty%2Flibarchive.git

Issue #631:  Move 'r' into an inner scope to fix shadowing
---

diff --git a/libarchive/archive_write_set_format_warc.c b/libarchive/archive_write_set_format_warc.c
index a761d3526..81beb75fd 100644
--- a/libarchive/archive_write_set_format_warc.c
+++ b/libarchive/archive_write_set_format_warc.c
@@ -182,11 +182,11 @@ _warc_header(struct archive_write *a, struct archive_entry *entry)
 {
 	struct warc_s *w = a->format_data;
 	struct archive_string hdr;
-	ssize_t r;
 #define MAX_HDR_SIZE 512
 
 	/* check whether warcinfo record needs outputting */
 	if (!w->omit_warcinfo) {
+		ssize_t r;
 		warc_essential_hdr_t wi = {
 			WT_INFO,
 			/*uri*/NULL,