changeset 16269:ee1df2d14b96

acl: Rename a local variable. * lib/set-mode-acl.c (set_acl): Use same variable name as in copy_acl.
author Bruno Haible <bruno@clisp.org>
date Wed, 11 Jan 2012 01:52:23 +0100
parents dad15f0cd2ff
children a81fb44bbdeb
files ChangeLog lib/set-mode-acl.c
diffstat 2 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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.
--- 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;
 }