Renamed a variable in flist.c.

diff --git a/acls.diff b/acls.diff
index 121ab3e..1ddb09f 100644 (file)
--- a/acls.diff
+++ b/acls.diff
@@ -834,7 +834,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +}
 +
 +/* Receive the ACL info the sender has included for this file-list entry. */
-+void receive_acl(struct file_struct *file, int f)
++void receive_acls(struct file_struct *file, int f)
 +{
 +      SMB_ACL_TYPE_T type;
 +      item_list *racl_list;
@@ -1360,7 +1360,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
        unsigned int l1 = 0, l2 = 0;
        int alloc_len, basename_len, dirname_len, linkname_len, sum_len;
 +#ifdef SUPPORT_ACLS
-+      int acl_len;
++      int xtra_len;
 +#endif
        OFF_T file_length;
        char *basename, *dirname, *bp;
@@ -1372,14 +1372,14 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +#ifdef SUPPORT_ACLS
 +      /* We need one or two index int32s when we're preserving ACLs. */
 +      if (preserve_acls)
-+              acl_len = (S_ISDIR(mode) ? 2 : 1) * sizeof (int32);
++              xtra_len = (S_ISDIR(mode) ? 2 : 1) * sizeof (int32);
 +      else
-+              acl_len = 0;
++              xtra_len = 0;
 +#endif
 +
        alloc_len = file_struct_len + dirname_len + basename_len
 +#ifdef SUPPORT_ACLS
-+                + acl_len
++                + xtra_len
 +#endif
                  + linkname_len + sum_len;
        bp = pool_alloc(flist->file_pool, alloc_len, "receive_file_entry");
@@ -1388,7 +1388,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
        memset(bp, 0, file_struct_len);
        bp += file_struct_len;
 +#ifdef SUPPORT_ACLS
-+      bp += acl_len;
++      bp += xtra_len;
 +#endif
  
        file->modtime = modtime;
@@ -1399,7 +1399,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  
 +#ifdef SUPPORT_ACLS
 +      if (preserve_acls)
-+              receive_acl(file, f);
++              receive_acls(file, f);
 +#endif
 +
        return file;
@@ -1410,7 +1410,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
        char linkname[MAXPATHLEN];
        int alloc_len, basename_len, dirname_len, linkname_len, sum_len;
 +#ifdef SUPPORT_ACLS
-+      int acl_len;
++      int xtra_len;
 +#endif
        char *basename, *dirname, *bp;
  
@@ -1422,15 +1422,15 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +#ifdef SUPPORT_ACLS
 +      /* We need one or two index int32s when we're preserving ACLs. */
 +      if (preserve_acls)
-+              acl_len = (S_ISDIR(st.st_mode) ? 2 : 1) * sizeof (int32);
++              xtra_len = (S_ISDIR(st.st_mode) ? 2 : 1) * sizeof (int32);
 +      else
-+              acl_len = 0;
++              xtra_len = 0;
 +#endif
 +
        alloc_len = file_struct_len + dirname_len + basename_len
 -          + linkname_len + sum_len;
 +#ifdef SUPPORT_ACLS
-+                + acl_len
++                + xtra_len
 +#endif
 +                + linkname_len + sum_len;
        if (flist)
@@ -1441,7 +1441,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
        memset(bp, 0, file_struct_len);
        bp += file_struct_len;
 +#ifdef SUPPORT_ACLS
-+      bp += acl_len;
++      bp += xtra_len;
 +#endif
  
        file->flags = flags;