diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-10-30 09:34:04 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-10-30 09:34:04 -0400 |
| commit | cf2cb783b77bf9a84c6485b492ebb7e09914b74f (patch) | |
| tree | 8f92eb578516e9d4d7a02e6f875707879df34dde /src/rust | |
| parent | c4b6b573880ba3f4806fed09e20ff384b556e277 (diff) | |
| parent | 038bc21f8894043fbdda0cc87adddfbad84f65c4 (diff) | |
| download | tor-cf2cb783b77bf9a84c6485b492ebb7e09914b74f.tar.gz tor-cf2cb783b77bf9a84c6485b492ebb7e09914b74f.zip | |
Merge branch 'maint-0.3.3' into maint-0.3.4
Diffstat (limited to 'src/rust')
| -rw-r--r-- | src/rust/protover/ffi.rs | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/rust/protover/ffi.rs b/src/rust/protover/ffi.rs index 857a6968af..7386e988c5 100644 --- a/src/rust/protover/ffi.rs +++ b/src/rust/protover/ffi.rs @@ -190,8 +190,7 @@ pub extern "C" fn protover_get_supported_protocols() -> *const c_char { #[no_mangle] pub extern "C" fn protover_compute_vote( list: *const Stringlist, - threshold: c_int, - allow_long_proto_names: bool, + threshold: c_int ) -> *mut c_char { if list.is_null() { @@ -206,13 +205,9 @@ pub extern "C" fn protover_compute_vote( let mut proto_entries: Vec<UnvalidatedProtoEntry> = Vec::new(); for datum in data { - let entry: UnvalidatedProtoEntry = match allow_long_proto_names { - true => match UnvalidatedProtoEntry::from_str_any_len(datum.as_str()) { - Ok(n) => n, - Err(_) => continue}, - false => match datum.parse() { - Ok(n) => n, - Err(_) => continue}, + let entry: UnvalidatedProtoEntry = match datum.parse() { + Ok(n) => n, + Err(_) => continue }; proto_entries.push(entry); } |