From 5d308865d0783d0cd70f7453c77980835ac5648e Mon Sep 17 00:00:00 2001 From: Angelo Mantellini Date: Wed, 21 Mar 2018 14:16:02 +0100 Subject: update android-sdk. Now it is possible to compile with clang Change-Id: I156aa48dd90467a2a7540eec11839c0111b13bd2 Signed-off-by: Angelo Mantellini --- .../libcurl_android/jni/libcurl/src/tool_xattr.c | 87 ---------------------- 1 file changed, 87 deletions(-) delete mode 100755 external/libcurl_android/jni/libcurl/src/tool_xattr.c (limited to 'external/libcurl_android/jni/libcurl/src/tool_xattr.c') diff --git a/external/libcurl_android/jni/libcurl/src/tool_xattr.c b/external/libcurl_android/jni/libcurl/src/tool_xattr.c deleted file mode 100755 index b2666d97..00000000 --- a/external/libcurl_android/jni/libcurl/src/tool_xattr.c +++ /dev/null @@ -1,87 +0,0 @@ -/*************************************************************************** - * _ _ ____ _ - * Project ___| | | | _ \| | - * / __| | | | |_) | | - * | (__| |_| | _ <| |___ - * \___|\___/|_| \_\_____| - * - * Copyright (C) 1998 - 2013, Daniel Stenberg, , et al. - * - * This software is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms - * are also available at http://curl.haxx.se/docs/copyright.html. - * - * You may opt to use, copy, modify, merge, publish, distribute and/or sell - * copies of the Software, and permit persons to whom the Software is - * furnished to do so, under the terms of the COPYING file. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ***************************************************************************/ -#include "tool_setup.h" - -#ifdef HAVE_FSETXATTR -# include /* header from libc, not from libattr */ -# define USE_XATTR -#elif defined(__FreeBSD_version) && (__FreeBSD_version > 500000) -# include -# include -# define USE_XATTR -#endif - -#include "tool_xattr.h" - -#include "memdebug.h" /* keep this as LAST include */ - -#ifdef USE_XATTR - -/* mapping table of curl metadata to extended attribute names */ -static const struct xattr_mapping { - const char *attr; /* name of the xattr */ - CURLINFO info; -} mappings[] = { - /* mappings proposed by - * http://freedesktop.org/wiki/CommonExtendedAttributes - */ - { "user.xdg.origin.url", CURLINFO_EFFECTIVE_URL }, - { "user.mime_type", CURLINFO_CONTENT_TYPE }, - { NULL, CURLINFO_NONE } /* last element, abort loop here */ -}; - -/* store metadata from the curl request alongside the downloaded - * file using extended attributes - */ -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) { -#ifdef HAVE_FSETXATTR_6 - err = fsetxattr(fd, mappings[i].attr, value, strlen(value), 0, 0); -#elif defined(HAVE_FSETXATTR_5) - err = fsetxattr(fd, mappings[i].attr, value, strlen(value), 0); -#elif defined(__FreeBSD_version) - err = extattr_set_fd(fd, EXTATTR_NAMESPACE_USER, mappings[i].attr, value, - strlen(value)); - /* FreeBSD's extattr_set_fd returns the length of the extended attribute - */ - err = err < 0 ? err : 0; -#endif - } - i++; - } - return err; -} -#else -int fwrite_xattr(CURL *curl, int fd) -{ - (void)curl; - (void)fd; - return 0; -} -#endif -- cgit 1.2.3-korg