# HG changeset patch
# User Bruno Haible <bruno@clisp.org>
# Date 1326243143 -3600
# Node ID ee1df2d14b966898942a7140de59595c385e91a4
# Parent  dad15f0cd2ffe7f9428ea22d93f0dcf480607c45
acl: Rename a local variable.

* lib/set-mode-acl.c (set_acl): Use same variable name as in copy_acl.

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2012-01-10  Bruno Haible  <bruno@clisp.org>
 
+	acl: Rename a local variable.
+	* lib/set-mode-acl.c (set_acl): Use same variable name as in copy_acl.
+
 	acl: Align return values of copy_acl and qcopy_acl.
 	* lib/copy-acl.c (copy_acl): Return the same value as qcopy_acl,
 	maybe < -1.
diff --git a/lib/set-mode-acl.c b/lib/set-mode-acl.c
--- a/lib/set-mode-acl.c
+++ b/lib/set-mode-acl.c
@@ -677,8 +677,8 @@
 int
 set_acl (char const *name, int desc, mode_t mode)
 {
-  int r = qset_acl (name, desc, mode);
-  if (r != 0)
+  int ret = qset_acl (name, desc, mode);
+  if (ret != 0)
     error (0, errno, _("setting permissions for %s"), quote (name));
-  return r;
+  return ret;
 }