From: Pavel Raiskup <praiskup@redhat.com>
Date: Mon, 12 Sep 2016 11:58:53 +0000 (+0200)
Subject: ftbfs: declare 'r' variable for non NFSv4 ACLs too
X-Git-Tag: v3.2.2~12^2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d22d06e1050e9339946c765d420561a7b1db2878;p=thirdparty%2Flibarchive.git

ftbfs: declare 'r' variable for non NFSv4 ACLs too
---

diff --git a/libarchive/archive_read_disk_entry_from_file.c b/libarchive/archive_read_disk_entry_from_file.c
index f12cbae05..1d49e2a82 100644
--- a/libarchive/archive_read_disk_entry_from_file.c
+++ b/libarchive/archive_read_disk_entry_from_file.c
@@ -587,12 +587,12 @@ translate_acl(struct archive_read_disk *a,
 #ifdef ACL_TYPE_NFS4
 	acl_entry_type_t acl_type;
 	acl_flagset_t	 acl_flagset;
-	int brand, r;
+	int brand;
 #endif
 	acl_entry_t	 acl_entry;
 	acl_permset_t	 acl_permset;
 	int		 i, entry_acl_type;
-	int		 s, ae_id, ae_tag, ae_perm;
+	int		 r, s, ae_id, ae_tag, ae_perm;
 	const char	*ae_name;