[tor-commits] [tor/maint-0.4.1] Adjust tor_log.rs for 64-bit log domains.
dgoulet at torproject.org
dgoulet at torproject.org
Thu Jul 25 13:09:13 UTC 2019
commit f682de609b456ccfdb19aef1a1afa8c0873ceb51
Author: Nick Mathewson <nickm at torproject.org>
Date: Fri Jul 19 10:07:32 2019 -0400
Adjust tor_log.rs for 64-bit log domains.
---
src/rust/tor_log/tor_log.rs | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/rust/tor_log/tor_log.rs b/src/rust/tor_log/tor_log.rs
index 98fccba5a..bbaf97129 100644
--- a/src/rust/tor_log/tor_log.rs
+++ b/src/rust/tor_log/tor_log.rs
@@ -99,14 +99,14 @@ pub mod log {
/// Domain log types. These mirror definitions in src/lib/log/log.h
/// C_RUST_COUPLED: src/lib/log/log.c, log severity types
extern "C" {
- static LD_NET_: u32;
- static LD_GENERAL_: u32;
+ static LD_NET_: u64;
+ static LD_GENERAL_: u64;
}
/// Translate Rust defintions of log domain levels to C. This exposes a 1:1
/// mapping between types.
#[inline]
- pub unsafe fn translate_domain(domain: LogDomain) -> u32 {
+ pub unsafe fn translate_domain(domain: LogDomain) -> u64 {
match domain {
LogDomain::Net => LD_NET_,
LogDomain::General => LD_GENERAL_,
@@ -128,7 +128,7 @@ pub mod log {
extern "C" {
pub fn tor_log_string(
severity: c_int,
- domain: u32,
+ domain: u64,
function: *const c_char,
string: *const c_char,
);
More information about the tor-commits
mailing list