From d22d06e1050e9339946c765d420561a7b1db2878 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Mon, 12 Sep 2016 13:58:53 +0200 Subject: [PATCH] ftbfs: declare 'r' variable for non NFSv4 ACLs too --- libarchive/archive_read_disk_entry_from_file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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; -- 2.47.2