commit 2ab39411eb42461fe01f2cb993a4fb8c6c58c8a8
author Treehugger Robot <treehugger-gerrit@google.com> Tue Jun 16 22:22:13 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 16 22:22:13 2020 +0000
tree 5a0499fa52e4af5eab3aa79334a2f16371c038a0
parent f9033832cfc203de9453f016b2e497789e017588
parent 1ab2c02324972e7c3355ee40e52549acd0e345f9

Merge "libmodprobe: improve error reporting."

libmodprobe/libmodprobe_ext.cpp

diff --git a/libmodprobe/libmodprobe_ext.cpp b/libmodprobe/libmodprobe_ext.cpp
index 84f7150..fb1f5e7 100644
--- a/libmodprobe/libmodprobe_ext.cpp
+++ b/libmodprobe/libmodprobe_ext.cpp
@@ -35,7 +35,7 @@
     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 @@
         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 @@
             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;
     }