From 3771b6acbfcf68bdca405b115f155aafb8be6608 Mon Sep 17 00:00:00 2001 From: Ken Chen Date: Fri, 12 Jan 2024 09:16:35 +0000 Subject: [Code Health] Delete spurious code "num >= MAXADDRS" can never happen in the for-loop. Test: 1. Modify system/etc/hosts to have over than MAXADDRS records, like 10.0.0.1 www.test.com 10.0.0.2 www.test.com ... 10.0.0.36 www.test.com 2. Trigger gethostbyname by "adb shell ping www.test.com" 3. Observe the result and there is no failure Change-Id: I4347307be9479214c48492aee180d46e1b97d3f4 --- sethostent.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/sethostent.cpp b/sethostent.cpp index 55b8c8bc..1bd8ab4c 100644 --- a/sethostent.cpp +++ b/sethostent.cpp @@ -132,7 +132,6 @@ int _hf_gethtbyname2(const char* name, int af, getnamaddr* info) { if ((size_t)(ptr - buf) >= info->buflen) goto nospc; } - if (num >= MAXADDRS) goto nospc; if (hp->h_addr_list[0] == nullptr) { free(buf); endhostent_r(&hf); -- cgit v1.2.3 From 616ec0e4cc5aa5dbfb7ae972bbc734e525b179e0 Mon Sep 17 00:00:00 2001 From: Jeff Vander Stoep Date: Mon, 29 Jan 2024 08:19:26 +0100 Subject: Remove use of deprecated function with_min_level This is needed to upgrade the android_logger crate from 0.12.0 to 0.13.3. with_max_level provides the same functionality as with_min_level. The renaming is admittedly confusing, but the new name is accurate and it makes sense that they deprecated and then removed the previously poorly named with_min_level. See crate documentation [1] and code [2]. [1]: https://docs.rs/android_logger/0.12.0/android_logger/struct.Config.html#method.with_min_level [2]: https://docs.rs/android_logger/0.12.0/src/android_logger/lib.rs.html#227 Bug: 322718401 Test: build and run CF with the change. Test: m aosp_cf_x86_64_phone Change-Id: I6f67e9260fdca29f4b1f77cacc186a0b8be62321 --- doh/ffi.rs | 12 +++++------- doh/tests/doh_frontend/src/ffi.rs | 4 +++- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doh/ffi.rs b/doh/ffi.rs index 63b98cc8..e183a620 100644 --- a/doh/ffi.rs +++ b/doh/ffi.rs @@ -122,8 +122,8 @@ pub const DOH_LOG_LEVEL_TRACE: u32 = 4; const DOH_PORT: u16 = 443; -fn level_from_u32(level: u32) -> Option { - use log::Level::*; +fn level_from_u32(level: u32) -> Option { + use log::LevelFilter::*; match level { DOH_LOG_LEVEL_ERROR => Some(Error), DOH_LOG_LEVEL_WARN => Some(Warn), @@ -139,17 +139,15 @@ fn level_from_u32(level: u32) -> Option { /// If called more than once, it will have no effect on subsequent calls. #[no_mangle] pub extern "C" fn doh_init_logger(level: u32) { - let log_level = level_from_u32(level).unwrap_or(log::Level::Error); - android_logger::init_once(android_logger::Config::default().with_min_level(log_level)); + let log_level = level_from_u32(level).unwrap_or(log::LevelFilter::Error); + android_logger::init_once(android_logger::Config::default().with_max_level(log_level)); } /// Set the log level. /// If an invalid level is passed, defaults to logging errors only. #[no_mangle] pub extern "C" fn doh_set_log_level(level: u32) { - let level_filter = level_from_u32(level) - .map(|level| level.to_level_filter()) - .unwrap_or(log::LevelFilter::Error); + let level_filter = level_from_u32(level).unwrap_or(log::LevelFilter::Error); log::set_max_level(level_filter); } diff --git a/doh/tests/doh_frontend/src/ffi.rs b/doh/tests/doh_frontend/src/ffi.rs index 37a5fba0..f4960fe4 100644 --- a/doh/tests/doh_frontend/src/ffi.rs +++ b/doh/tests/doh_frontend/src/ffi.rs @@ -198,7 +198,9 @@ pub extern "C" fn frontend_stats_clear_queries(doh: &DohFrontend) -> bool { #[no_mangle] pub extern "C" fn init_android_logger() { android_logger::init_once( - android_logger::Config::default().with_tag("DohFrontend").with_min_level(log::Level::Debug), + android_logger::Config::default() + .with_tag("DohFrontend") + .with_max_level(log::LevelFilter::Debug), ); } -- cgit v1.2.3