>From eb43217bc90b138509132d5185de43434e33120d Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Wed, 11 Jan 2012 01:52:23 +0100 Subject: [PATCH 2/5] acl: Tweak. * lib/set-mode-acl.c (set_acl): Use same variable name as in copy_acl. --- ChangeLog | 3 +++ lib/set-mode-acl.c | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index d7c6fd4..ca333ec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2012-01-10 Bruno Haible + acl: Tweak. + * 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 b9d202e..a81b321 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; } -- 1.6.3.2