Revert "Update to 7.40.1"

[platform/upstream/curl.git] / src / tool_xattr.c

diff --git a/src/tool_xattr.c b/src/tool_xattr.c
index da0cad6..b2666d9 100644 (file)
--- a/src/tool_xattr.c
+++ b/src/tool_xattr.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution. The terms
@@ -56,12 +56,11 @@ int fwrite_xattr(CURL *curl, int fd)
 {
   int i = 0;
   int err = 0;
-
   /* loop through all xattr-curlinfo pairs and abort on a set error */
   while(err == 0 && mappings[i].attr != NULL) {
     char *value = NULL;
-    CURLcode result = curl_easy_getinfo(curl, mappings[i].info, &value);
-    if(!result && value) {
+    CURLcode rc = curl_easy_getinfo(curl, mappings[i].info, &value);
+    if(rc == CURLE_OK && value) {
 #ifdef HAVE_FSETXATTR_6
       err = fsetxattr(fd, mappings[i].attr, value, strlen(value), 0, 0);
 #elif defined(HAVE_FSETXATTR_5)
@@ -76,7 +75,6 @@ int fwrite_xattr(CURL *curl, int fd)
     }
     i++;
   }
-
   return err;
 }
 #else
@@ -84,7 +82,6 @@ int fwrite_xattr(CURL *curl, int fd)
 {
   (void)curl;
   (void)fd;
-
   return 0;
 }
 #endif