Skip to content

Commit 0056b0c

Browse files
committed
add url
1 parent 0772a65 commit 0056b0c

File tree

8 files changed

+1045
-38
lines changed

8 files changed

+1045
-38
lines changed

Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ zlib-ng-compat = ["curl-sys/zlib-ng-compat", "static-curl"]
5050
upkeep_7_62_0 = ["curl-sys/upkeep_7_62_0"]
5151
poll_7_68_0 = ["curl-sys/poll_7_68_0"]
5252
ntlm = ["curl-sys/ntlm"]
53+
url = ["curl-sys/url"]
5354

5455
[[test]]
5556
name = "atexit"

curl-sys/lib.rs

Lines changed: 39 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1171,42 +1171,42 @@ extern "C" {
11711171
mod url {
11721172
use super::*;
11731173

1174-
pub type CURLUCode = __enum_ty;
1174+
pub type CURLUcode = __enum_ty;
11751175
pub type CURLUPart = __enum_ty;
11761176

1177-
pub const CURLUE_OK: CURLUCode = 0;
1178-
pub const CURLUE_BAD_HANDLE: CURLUCode = 1;
1179-
pub const CURLUE_BAD_PARTPOINTER: CURLUCode = 2;
1180-
pub const CURLUE_MALFORMED_INPUT: CURLUCode = 3;
1181-
pub const CURLUE_BAD_PORT_NUMBER: CURLUCode = 4;
1182-
pub const CURLUE_UNSUPPORTED_SCHEME: CURLUCode = 5;
1183-
pub const CURLUE_URLDECODE: CURLUCode = 6;
1184-
pub const CURLUE_OUT_OF_MEMORY: CURLUCode = 7;
1185-
pub const CURLUE_USER_NOT_ALLOWED: CURLUCode = 8;
1186-
pub const CURLUE_UNKNOWN_PART: CURLUCode = 9;
1187-
pub const CURLUE_NO_SCHEME: CURLUCode = 10;
1188-
pub const CURLUE_NO_USER: CURLUCode = 11;
1189-
pub const CURLUE_NO_PASSWORD: CURLUCode = 12;
1190-
pub const CURLUE_NO_OPTIONS: CURLUCode = 13;
1191-
pub const CURLUE_NO_HOST: CURLUCode = 14;
1192-
pub const CURLUE_NO_PORT: CURLUCode = 15;
1193-
pub const CURLUE_NO_QUERY: CURLUCode = 16;
1194-
pub const CURLUE_NO_FRAGMENT: CURLUCode = 17;
1195-
pub const CURLUE_NO_ZONEID: CURLUCode = 18;
1196-
pub const CURLUE_BAD_FILE_URL: CURLUCode = 19;
1197-
pub const CURLUE_BAD_FRAGMENT: CURLUCode = 20;
1198-
pub const CURLUE_BAD_HOSTNAME: CURLUCode = 21;
1199-
pub const CURLUE_BAD_IPV6: CURLUCode = 22;
1200-
pub const CURLUE_BAD_LOGIN: CURLUCode = 23;
1201-
pub const CURLUE_BAD_PASSWORD: CURLUCode = 24;
1202-
pub const CURLUE_BAD_PATH: CURLUCode = 25;
1203-
pub const CURLUE_BAD_QUERY: CURLUCode = 26;
1204-
pub const CURLUE_BAD_SCHEME: CURLUCode = 27;
1205-
pub const CURLUE_BAD_SLASHES: CURLUCode = 28;
1206-
pub const CURLUE_BAD_USER: CURLUCode = 29;
1207-
pub const CURLUE_LACKS_IDN: CURLUCode = 30;
1208-
pub const CURLUE_TOO_LARGE: CURLUCode = 31;
1209-
pub const CURLUE_LAST: CURLUCode = 32;
1177+
pub const CURLUE_OK: CURLUcode = 0;
1178+
pub const CURLUE_BAD_HANDLE: CURLUcode = 1;
1179+
pub const CURLUE_BAD_PARTPOINTER: CURLUcode = 2;
1180+
pub const CURLUE_MALFORMED_INPUT: CURLUcode = 3;
1181+
pub const CURLUE_BAD_PORT_NUMBER: CURLUcode = 4;
1182+
pub const CURLUE_UNSUPPORTED_SCHEME: CURLUcode = 5;
1183+
pub const CURLUE_URLDECODE: CURLUcode = 6;
1184+
pub const CURLUE_OUT_OF_MEMORY: CURLUcode = 7;
1185+
pub const CURLUE_USER_NOT_ALLOWED: CURLUcode = 8;
1186+
pub const CURLUE_UNKNOWN_PART: CURLUcode = 9;
1187+
pub const CURLUE_NO_SCHEME: CURLUcode = 10;
1188+
pub const CURLUE_NO_USER: CURLUcode = 11;
1189+
pub const CURLUE_NO_PASSWORD: CURLUcode = 12;
1190+
pub const CURLUE_NO_OPTIONS: CURLUcode = 13;
1191+
pub const CURLUE_NO_HOST: CURLUcode = 14;
1192+
pub const CURLUE_NO_PORT: CURLUcode = 15;
1193+
pub const CURLUE_NO_QUERY: CURLUcode = 16;
1194+
pub const CURLUE_NO_FRAGMENT: CURLUcode = 17;
1195+
pub const CURLUE_NO_ZONEID: CURLUcode = 18;
1196+
pub const CURLUE_BAD_FILE_URL: CURLUcode = 19;
1197+
pub const CURLUE_BAD_FRAGMENT: CURLUcode = 20;
1198+
pub const CURLUE_BAD_HOSTNAME: CURLUcode = 21;
1199+
pub const CURLUE_BAD_IPV6: CURLUcode = 22;
1200+
pub const CURLUE_BAD_LOGIN: CURLUcode = 23;
1201+
pub const CURLUE_BAD_PASSWORD: CURLUcode = 24;
1202+
pub const CURLUE_BAD_PATH: CURLUcode = 25;
1203+
pub const CURLUE_BAD_QUERY: CURLUcode = 26;
1204+
pub const CURLUE_BAD_SCHEME: CURLUcode = 27;
1205+
pub const CURLUE_BAD_SLASHES: CURLUcode = 28;
1206+
pub const CURLUE_BAD_USER: CURLUcode = 29;
1207+
pub const CURLUE_LACKS_IDN: CURLUcode = 30;
1208+
pub const CURLUE_TOO_LARGE: CURLUcode = 31;
1209+
pub const CURLUE_LAST: CURLUcode = 32;
12101210

12111211
pub const CURLUPART_URL: CURLUPart = 0;
12121212
pub const CURLUPART_SCHEME: CURLUPart = 1;
@@ -1218,7 +1218,7 @@ mod url {
12181218
pub const CURLUPART_PATH: CURLUPart = 7;
12191219
pub const CURLUPART_QUERY: CURLUPart = 8;
12201220
pub const CURLUPART_FRAGMENT: CURLUPart = 9;
1221-
pub const CURLUPART_ZONEID: CURLUPart = 10;
1221+
pub const CURLUPART_ZONEID: CURLUPart = 10; // Added in 7.65.0
12221222

12231223
pub const CURLU_DEFAULT_PORT: c_uint = 1 << 0;
12241224
pub const CURLU_NO_DEFAULT_PORT: c_uint = 1 << 1;
@@ -1248,14 +1248,15 @@ mod url {
12481248
what: CURLUPart,
12491249
part: *mut *mut c_char,
12501250
flags: c_uint,
1251-
) -> CURLUCode;
1251+
) -> CURLUcode;
12521252
pub fn curl_url_set(
12531253
handle: *mut CURLU,
12541254
what: CURLUPart,
12551255
part: *const c_char,
12561256
flags: c_uint,
1257-
) -> CURLUCode;
1258-
pub fn curl_url_strerror(code: CURLUCode) -> *const c_char;
1257+
) -> CURLUcode;
1258+
// Added in 7.80.0
1259+
// pub fn curl_url_strerror(code: CURLUCode) -> *const c_char;
12591260
}
12601261
}
12611262
#[cfg(feature = "url")]

src/lib.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ mod version;
6969
pub mod easy;
7070
pub mod multi;
7171
mod panic;
72+
#[cfg(feature = "url")]
73+
pub mod url;
7274

7375
#[cfg(test)]
7476
static INITIALIZED: std::sync::atomic::AtomicBool = std::sync::atomic::AtomicBool::new(false);

0 commit comments

Comments
 (0)