summaryrefslogtreecommitdiffstats
path: root/Utilities/cmcurl/lib/wildcard.c
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2018-05-18 14:16:50 (GMT)
committerBrad King <brad.king@kitware.com>2018-05-18 14:16:50 (GMT)
commit3e913b819d8d8118d5e8dc3b7289f622e9ca92e5 (patch)
tree82c19f5ec814c84b986e54e3fc6fa0a83622fd81 /Utilities/cmcurl/lib/wildcard.c
parentf3c73b878c594d40119e480ca1074e733d7ba1ce (diff)
parentd431136e029c652f5913bcebeaab3b9236b114c4 (diff)
downloadCMake-3e913b819d8d8118d5e8dc3b7289f622e9ca92e5.zip
CMake-3e913b819d8d8118d5e8dc3b7289f622e9ca92e5.tar.gz
CMake-3e913b819d8d8118d5e8dc3b7289f622e9ca92e5.tar.bz2
Merge branch 'upstream-curl' into update-curl
* upstream-curl: curl 2018-05-15 (cb013830)
Diffstat (limited to 'Utilities/cmcurl/lib/wildcard.c')
-rw-r--r--Utilities/cmcurl/lib/wildcard.c20
1 files changed, 13 insertions, 7 deletions
diff --git a/Utilities/cmcurl/lib/wildcard.c b/Utilities/cmcurl/lib/wildcard.c
index af45c79..8ba0989 100644
--- a/Utilities/cmcurl/lib/wildcard.c
+++ b/Utilities/cmcurl/lib/wildcard.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2018, 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
@@ -30,9 +30,15 @@
#include "curl_memory.h"
#include "memdebug.h"
+static void fileinfo_dtor(void *user, void *element)
+{
+ (void)user;
+ Curl_fileinfo_cleanup(element);
+}
+
CURLcode Curl_wildcard_init(struct WildcardData *wc)
{
- Curl_llist_init(&wc->filelist, Curl_fileinfo_dtor);
+ Curl_llist_init(&wc->filelist, fileinfo_dtor);
wc->state = CURLWC_INIT;
return CURLE_OK;
@@ -43,12 +49,12 @@ void Curl_wildcard_dtor(struct WildcardData *wc)
if(!wc)
return;
- if(wc->tmp_dtor) {
- wc->tmp_dtor(wc->tmp);
- wc->tmp_dtor = ZERO_NULL;
- wc->tmp = NULL;
+ if(wc->dtor) {
+ wc->dtor(wc->protdata);
+ wc->dtor = ZERO_NULL;
+ wc->protdata = NULL;
}
- DEBUGASSERT(wc->tmp == NULL);
+ DEBUGASSERT(wc->protdata == NULL);
Curl_llist_destroy(&wc->filelist, NULL);