diff --git a/sandboxed_api/sandbox2/mounts.cc b/sandboxed_api/sandbox2/mounts.cc index b480d0d..1ff10e8 100644 --- a/sandboxed_api/sandbox2/mounts.cc +++ b/sandboxed_api/sandbox2/mounts.cc @@ -472,13 +472,13 @@ absl::Status Mounts::AddMappingsForBinary(const std::string& path, to_resolve.emplace_back(imported_lib, 1); } - if (SAPI_VLOG_IS_ON(1)) { + if (SAPI_RAW_VLOG_IS_ON(1)) { SAPI_RAW_VLOG( 1, "Resolving dynamic library dependencies of %s using these dirs:", path.c_str()); LogContainer(full_search_paths); } - if (SAPI_VLOG_IS_ON(2)) { + if (SAPI_RAW_VLOG_IS_ON(2)) { SAPI_RAW_VLOG(2, "Direct dependencies of %s to resolve:", path.c_str()); LogContainer(imported_libs); } @@ -531,7 +531,7 @@ absl::Status Mounts::AddMappingsForBinary(const std::string& path, "Exceeded max entries pending resolving limit"); } - if (SAPI_VLOG_IS_ON(2)) { + if (SAPI_RAW_VLOG_IS_ON(2)) { SAPI_RAW_VLOG(2, "Transitive dependencies of %s to resolve (depth = %d): ", resolved_lib.c_str(), depth + 1); diff --git a/sandboxed_api/sandbox2/namespace.cc b/sandboxed_api/sandbox2/namespace.cc index 26a45f2..d8c6847 100644 --- a/sandboxed_api/sandbox2/namespace.cc +++ b/sandboxed_api/sandbox2/namespace.cc @@ -325,7 +325,7 @@ void Namespace::InitializeNamespaces(uid_t uid, gid_t gid, int32_t clone_flags, "changing mount propagation to private failed"); } - if (SAPI_VLOG_IS_ON(2)) { + if (SAPI_RAW_VLOG_IS_ON(2)) { SAPI_RAW_VLOG(2, "Dumping the sandboxee's filesystem:"); LogFilesystem("/"); } diff --git a/sandboxed_api/util/raw_logging.h b/sandboxed_api/util/raw_logging.h index 012c761..f4bd280 100644 --- a/sandboxed_api/util/raw_logging.h +++ b/sandboxed_api/util/raw_logging.h @@ -88,6 +88,8 @@ #define SAPI_VLOG_IS_ON(verbose_level) \ ::sapi::raw_logging_internal::VLogIsOn(verbose_level) +#define SAPI_RAW_VLOG_IS_ON(verbose_level) SAPI_VLOG_IS_ON(verbose_level) + #ifndef VLOG // `VLOG` uses numeric levels to provide verbose logging that can configured at // runtime, globally. `VLOG` statements are logged at `INFO` severity if they