ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "libmodprobe: improve error reporting."

Browse source
This commit is contained in:
Treehugger Robot 2020-06-16 22:22:13 +00:00 • committed by Gerrit Code Review
commit 2ab39411eb
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libmodprobe/libmodprobe_ext.cpp
View file

@ -35,7 +35,7 @@ bool Modprobe::Insmod(const std::string& path_name, const std::string& parameter
android::base::unique_fd fd(
TEMP_FAILURE_RETRY(open(path_name.c_str(), O_RDONLY | O_NOFOLLOW | O_CLOEXEC)));
if (fd == -1) {
LOG(ERROR) << "Could not open module '" << path_name << "'";
PLOG(ERROR) << "Could not open module '" << path_name << "'";
return false;
}
@ -49,7 +49,7 @@ bool Modprobe::Insmod(const std::string& path_name, const std::string& parameter
options = options + " " + parameters;
}
LOG(INFO) << "Loading module " << path_name << " with args \"" << options << "\"";
LOG(INFO) << "Loading module " << path_name << " with args '" << options << "'";
int ret = syscall(__NR_finit_module, fd.get(), options.c_str(), 0);
if (ret != 0) {
if (errno == EEXIST) {
@ -57,7 +57,7 @@ bool Modprobe::Insmod(const std::string& path_name, const std::string& parameter
module_loaded_.emplace(canonical_name);
return true;
}
LOG(ERROR) << "Failed to insmod '" << path_name << "' with args '" << options << "'";
PLOG(ERROR) << "Failed to insmod '" << path_name << "' with args '" << options << "'";
return false;
}