From: Jim Meyering <meyering@redhat.com>
Date: Mon, 27 Apr 2009 09:35:50 +0000 (+0200)
Subject: copy.c: factor out test for errno value indicating "unsupported"
X-Git-Tag: v7.3~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0cf592f;p=thirdparty%2Fcoreutils.git

copy.c: factor out test for errno value indicating "unsupported"

* src/copy.c (errno_unsupported): New function.
(copy_attr_error, copy_internal): Use it.
---

diff --git a/src/copy.c b/src/copy.c
index 1687b72c2f..511f70500c 100644
--- a/src/copy.c
+++ b/src/copy.c
@@ -131,6 +131,12 @@ is_ancestor (const struct stat *sb, const struct dir_list *ancestors)
   return false;
 }
 
+static bool
+errno_unsupported (int err)
+{
+  return err == ENOTSUP || err == ENODATA;
+}
+
 #if USE_XATTR
 static void
 copy_attr_error (struct error_context *ctx ATTRIBUTE_UNUSED,
@@ -139,6 +145,7 @@ copy_attr_error (struct error_context *ctx ATTRIBUTE_UNUSED,
   int err = errno;
   va_list ap;
 
+  if (!errno_unsupported (errno))
   if (errno != ENOTSUP && errno != ENODATA)
     {
       /* use verror module to print error message */
@@ -1764,7 +1771,7 @@ copy_internal (char const *src_name, char const *dst_name,
 	}
       else
 	{
-	  if ((errno != ENOTSUP && errno != ENODATA) || x->require_preserve_context)
+          if (!errno_unsupported (errno) || x->require_preserve_context)
 	    {
 	      if (!x->reduce_diagnostics || x->require_preserve_context)
 	        error (0, errno,