Commit 4ff5d32a authored by Steve Holme's avatar Steve Holme
Browse files

tool_xattr: Use 'CURLcode result' for curl result codes

parent ed16a169

src/tool_xattr.c

+6 −3
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2014, 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,11 +56,12 @@ 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 rc = curl_easy_getinfo(curl, mappings[i].info, &value);

    if(rc == CURLE_OK && value) {

    CURLcode result = curl_easy_getinfo(curl, mappings[i].info, &value);

    if(!result && value) {

#ifdef HAVE_FSETXATTR_6

      err = fsetxattr(fd, mappings[i].attr, value, strlen(value), 0, 0);

#elif defined(HAVE_FSETXATTR_5)
@@ -75,6 +76,7 @@ int fwrite_xattr(CURL *curl, int fd) 
    }

    i++;

  }



  return err;

}

#else
@@ -82,6 +84,7 @@ int fwrite_xattr(CURL *curl, int fd) 
{

  (void)curl;

  (void)fd;



  return 0;

}

#endif