mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-10 21:23:58 +01:00
Merge remote-tracking branch 'tor-github/pr/466'
This commit is contained in:
commit
c8892b53ec
3
changes/ticket28077
Normal file
3
changes/ticket28077
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
o Code simplification and refactoring:
|
||||||
|
- Remove unnecessarily unsafe code from the rust macro cstr!. Closes
|
||||||
|
ticket 28077.
|
@ -105,11 +105,7 @@ macro_rules! cstr {
|
|||||||
($($bytes:expr),*) => (
|
($($bytes:expr),*) => (
|
||||||
::std::ffi::CStr::from_bytes_with_nul(
|
::std::ffi::CStr::from_bytes_with_nul(
|
||||||
concat!($($bytes),*, "\0").as_bytes()
|
concat!($($bytes),*, "\0").as_bytes()
|
||||||
).unwrap_or(
|
).unwrap_or_default()
|
||||||
unsafe{
|
|
||||||
::std::ffi::CStr::from_bytes_with_nul_unchecked(b"\0")
|
|
||||||
}
|
|
||||||
)
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user