diff options
author | Curl Upstream <curl-library@cool.haxx.se> | 2020-06-30 13:30:38 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2020-07-01 14:09:50 (GMT) |
commit | 4446fda8e019a0138bec1aa2d83a720d63019ff9 (patch) | |
tree | 470d68139edf0b965ead4ecaf805a222e34e98f9 /include | |
parent | 5717fdc114a704cddae629e20e6588191360e98a (diff) | |
download | CMake-4446fda8e019a0138bec1aa2d83a720d63019ff9.zip CMake-4446fda8e019a0138bec1aa2d83a720d63019ff9.tar.gz CMake-4446fda8e019a0138bec1aa2d83a720d63019ff9.tar.bz2 |
curl 2020-06-30 (5a1fc8d3)
Code extracted from:
https://github.com/curl/curl.git
at commit 5a1fc8d33808d7b22f57bdf9403cda7ff07b0670 (curl-7_71_1).
Diffstat (limited to 'include')
-rw-r--r-- | include/curl/curl.h | 6 | ||||
-rw-r--r-- | include/curl/curlver.h | 6 | ||||
-rw-r--r-- | include/curl/multi.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/include/curl/curl.h b/include/curl/curl.h index d5f8817..e3531f5 100644 --- a/include/curl/curl.h +++ b/include/curl/curl.h @@ -774,7 +774,7 @@ enum curl_khtype { }; struct curl_khkey { - const char *key; /* points to a zero-terminated string encoded with base64 + const char *key; /* points to a null-terminated string encoded with base64 if len is zero, otherwise to the "raw" data */ size_t len; enum curl_khtype keytype; @@ -1446,7 +1446,7 @@ typedef enum { /* 132 OBSOLETE. Gone in 7.16.0 */ /* 133 OBSOLETE. Gone in 7.16.0 */ - /* zero terminated string for pass on to the FTP server when asked for + /* null-terminated string for pass on to the FTP server when asked for "account" info */ CURLOPT(CURLOPT_FTP_ACCOUNT, CURLOPTTYPE_STRINGPOINT, 134), @@ -2118,7 +2118,7 @@ typedef enum { CURL_TIMECOND_LAST } curl_TimeCond; -/* Special size_t value signaling a zero-terminated string. */ +/* Special size_t value signaling a null-terminated string. */ #define CURL_ZERO_TERMINATED ((size_t) -1) /* curl_strequal() and curl_strnequal() are subject for removal in a future diff --git a/include/curl/curlver.h b/include/curl/curlver.h index a398b0b..fe29f0f 100644 --- a/include/curl/curlver.h +++ b/include/curl/curlver.h @@ -30,13 +30,13 @@ /* This is the version number of the libcurl package from which this header file origins: */ -#define LIBCURL_VERSION "7.71.0-DEV" +#define LIBCURL_VERSION "7.71.1-DEV" /* The numeric version number is also available "in parts" by using these defines: */ #define LIBCURL_VERSION_MAJOR 7 #define LIBCURL_VERSION_MINOR 71 -#define LIBCURL_VERSION_PATCH 0 +#define LIBCURL_VERSION_PATCH 1 /* This is the numeric version of the libcurl version number, meant for easier parsing and comparisons by programs. The LIBCURL_VERSION_NUM define will @@ -57,7 +57,7 @@ CURL_VERSION_BITS() macro since curl's own configure script greps for it and needs it to contain the full number. */ -#define LIBCURL_VERSION_NUM 0x074700 +#define LIBCURL_VERSION_NUM 0x074701 /* * This is the date and time when the full source package was created. The diff --git a/include/curl/multi.h b/include/curl/multi.h index 3039e78..2e6bb72 100644 --- a/include/curl/multi.h +++ b/include/curl/multi.h @@ -267,7 +267,7 @@ CURL_EXTERN CURLMsg *curl_multi_info_read(CURLM *multi_handle, * value into the equivalent human readable error string. This is * useful for printing meaningful error messages. * - * Returns: A pointer to a zero-terminated error message. + * Returns: A pointer to a null-terminated error message. */ CURL_EXTERN const char *curl_multi_strerror(CURLMcode); |