diff options
| author | Isis Lovecruft <isis@torproject.org> | 2018-02-10 01:41:06 +0000 |
|---|---|---|
| committer | Isis Lovecruft <isis@torproject.org> | 2018-02-10 02:19:18 +0000 |
| commit | 081e99c16f754ffd5605acdfddec527a2a426ed8 (patch) | |
| tree | 583f8e480e9ace2842067584b2fcb499374f8f59 /src/rust/protover | |
| parent | 6c77593a57d5a22a2fb3105d1466fb3ed26b1244 (diff) | |
| download | tor-081e99c16f754ffd5605acdfddec527a2a426ed8.tar.gz tor-081e99c16f754ffd5605acdfddec527a2a426ed8.zip | |
rust: Remove empty_static_cstr() in favour of new cstr!() macro.
Diffstat (limited to 'src/rust/protover')
| -rw-r--r-- | src/rust/protover/ffi.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/rust/protover/ffi.rs b/src/rust/protover/ffi.rs index c86fe75227..1df0b6675f 100644 --- a/src/rust/protover/ffi.rs +++ b/src/rust/protover/ffi.rs @@ -13,7 +13,6 @@ use protover::*; use smartlist::*; use tor_allocate::allocate_and_copy_string; use tor_util::strings::byte_slice_is_c_like; -use tor_util::strings::empty_static_cstr; /// Translate C enums to Rust Proto enums, using the integer value of the C /// enum to map to its associated Rust enum @@ -192,7 +191,7 @@ pub extern "C" fn protover_compute_for_old_tor(version: *const c_char) -> *const let supported: &'static CStr; let empty: &'static CStr; - empty = empty_static_cstr(); + empty = cstr!(""); if version.is_null() { return empty.as_ptr(); |