From: Bruno Haible <bruno@clisp.org>
Date: Wed, 11 Jan 2012 00:52:23 +0000 (+0100)
Subject: acl: Rename a local variable.
X-Git-Tag: v0.1~1257
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=3cd156c0f551e2d5981365c207b9a4e11fce942a;p=gnulib.git

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
index ec288e5c0..3b589df8d 100644
--- 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
index b9d202ee2..a81b321b6 100644
--- a/lib/set-mode-acl.c
+++ b/lib/set-mode-acl.c
@@ -677,8 +677,8 @@ qset_acl (char const *name, int desc, mode_t mode)
 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;
 }