* fileio.c (Fcopy_file): Pacify gcc re fchown. (Bug#9002)

This works around a problem with the previous change to Fcopy_file.
Recent glibc declares fchown with __attribute__((warn_unused_result)),
and without this change, GCC might complain about discarding
fchown's return value.

diff --git a/src/ChangeLog b/src/ChangeLog
index 7f8717176b0521a1ff52306eb47d1e1dbfa4b97a..d12558e5d6dfb97af0cc27e8602836c0a3e0b141 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2011-07-17  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * fileio.c (Fcopy_file): Pacify gcc re fchown.  (Bug#9002)
+       This works around a problem with the previous change to Fcopy_file.
+       Recent glibc declares fchown with __attribute__((warn_unused_result)),
+       and without this change, GCC might complain about discarding
+       fchown's return value.
+
 2011-07-16  Juanma Barranquero  <lekktu@gmail.com>
 
        * makefile.w32-in (GLOBAL_SOURCES): Add gnutls.c (followup to bug#9059).

diff --git a/src/fileio.c b/src/fileio.c
index de822cdb46686eefe39e30491773707e38d92315..a52e834c2b270758b6b59afe661da24c5b04c73a 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -38,6 +38,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <selinux/context.h>
 #endif
 
+#include <ignore-value.h>
+
 #include "lisp.h"
 #include "intervals.h"
 #include "buffer.h"
@@ -1960,7 +1962,7 @@ on the system, we copy the SELinux context of FILE to NEWNAME.  */)
   if (input_file_statable_p)
     {
       if (!NILP (preserve_uid_gid))
-       fchown (ofd, st.st_uid, st.st_gid);
+       ignore_value (fchown (ofd, st.st_uid, st.st_gid));
       if (fchmod (ofd, st.st_mode & 07777) != 0)
        report_file_error ("Doing chmod", Fcons (newname, Qnil));
     }