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 f12cbae0545c3c1bd51582ece9b3360cd83548fd..1d49e2a824244a0a2d943bffcad0beb8bcad4d39 100644 (file)
--- 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;