diff options
| author | Brad King <brad.king@kitware.com> | 2018-05-21 13:52:06 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-05-21 13:53:06 (GMT) |
| commit | 722056372e4ae640c1e61ac1dabfdd8a2737a35f (patch) | |
| tree | 505f7457bc70f8f72d161e2c4660b6387713a702 /Utilities/cmcurl/lib/wildcard.h | |
| parent | 4d6f4500dfbb4ea46c0ee8b736979305d3e9c0d8 (diff) | |
| parent | 3e913b819d8d8118d5e8dc3b7289f622e9ca92e5 (diff) | |
| download | CMake-722056372e4ae640c1e61ac1dabfdd8a2737a35f.zip CMake-722056372e4ae640c1e61ac1dabfdd8a2737a35f.tar.gz CMake-722056372e4ae640c1e61ac1dabfdd8a2737a35f.tar.bz2 | |
Merge topic 'update-curl'
3e913b819d Merge branch 'upstream-curl' into update-curl
d431136e02 curl 2018-05-15 (cb013830)
f3c73b878c curl: Update script to get curl 7.60.0
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2091
Diffstat (limited to 'Utilities/cmcurl/lib/wildcard.h')
| -rw-r--r-- | Utilities/cmcurl/lib/wildcard.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Utilities/cmcurl/lib/wildcard.h b/Utilities/cmcurl/lib/wildcard.h index 8a5e4b7..b782612 100644 --- a/Utilities/cmcurl/lib/wildcard.h +++ b/Utilities/cmcurl/lib/wildcard.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 2010 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 2010 - 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 @@ -40,7 +40,7 @@ typedef enum { will end */ } curl_wildcard_states; -typedef void (*curl_wildcard_tmp_dtor)(void *ptr); +typedef void (*curl_wildcard_dtor)(void *ptr); /* struct keeping information about wildcard download process */ struct WildcardData { @@ -48,8 +48,8 @@ struct WildcardData { char *path; /* path to the directory, where we trying wildcard-match */ char *pattern; /* wildcard pattern */ struct curl_llist filelist; /* llist with struct Curl_fileinfo */ - void *tmp; /* pointer to protocol specific temporary data */ - curl_wildcard_tmp_dtor tmp_dtor; + void *protdata; /* pointer to protocol specific temporary data */ + curl_wildcard_dtor dtor; void *customptr; /* for CURLOPT_CHUNK_DATA pointer */ }; |