From: Eric Blake <ebb9@byu.net>
Date: Fri, 6 Jun 2008 14:34:18 +0000 (-0600)
Subject: Avoid gcc warning on cygwin.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a2540a70bc9409f3ee7f730ff22b101e711c726;p=pspp

Avoid gcc warning on cygwin.

* lib/copy-acl.c (qcopy_acl) [!HAVE_ACL_GET_FILE &&
!ACL_NO_TRIVIAL]: Avoid unused variable.

Signed-off-by: Eric Blake <ebb9@byu.net>
---

diff --git a/ChangeLog b/ChangeLog
index f30e733708..f72c568f46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-06  Eric Blake  <ebb9@byu.net>
+
+	Avoid gcc warning on cygwin.
+	* lib/copy-acl.c (qcopy_acl) [!HAVE_ACL_GET_FILE &&
+	!ACL_NO_TRIVIAL]: Avoid unused variable.
+
 2008-06-05  Eric Blake  <ebb9@byu.net>
 
 	Be tolerant of UNKNOWN version in gnulib-tool test dir.
diff --git a/lib/copy-acl.c b/lib/copy-acl.c
index 3bb5187d0c..d94f8871d7 100644
--- a/lib/copy-acl.c
+++ b/lib/copy-acl.c
@@ -155,7 +155,8 @@ qcopy_acl (const char *src_name, int source_desc, const char *dst_name,
 
 #else
 
-  return qset_acl (dst_name, dest_desc, mode);
+  ret = qset_acl (dst_name, dest_desc, mode);
+  return ret;
 
 #endif
 }