commit 2178081cd90ebcd77c867d52a8b0e15f0d4134cc
author Steven Moreland <smoreland@google.com> Fri Sep 11 01:29:45 2020 +0000
committer Treehugger Robot <treehugger-gerrit@google.com> Wed Sep 16 19:56:14 2020 +0000
tree 60121b57b0dfab00beb6ccd38826a05a0567daee
parent 40d398a0d28ad652afe1168d3abc7cd5231ae4de

Use AIDL_* errors over libbase logging.

This:
- gives us line numbers in source AIDL files reflecting errors
- makes it possible aidl_parser_fuzzer can detect when we return an
  error but don't provide any output logging

Bug: N/A
Test: aidl_unittest
Change-Id: I0479fd8d87547c1f0b1be754f9b8f6865db3cbef

io_delegate.cpp

diff --git a/io_delegate.cpp b/io_delegate.cpp
index 4b2e00a..c0ee97a 100644
--- a/io_delegate.cpp
+++ b/io_delegate.cpp
@@ -22,6 +22,8 @@
 
 #ifdef _WIN32
 #include <direct.h>
+#include <windows.h>
+#undef ERROR
 #else
 #include <dirent.h>
 #include <sys/stat.h>
@@ -49,7 +51,7 @@
   char buf[4096];
   DWORD path_len = GetFullPathName(path.c_str(), sizeof(buf), buf, nullptr);
   if (path_len <= 0 || path_len >= sizeof(buf)) {
-    LOG(ERROR) << "Failed to GetFullPathName(" << path << ")";
+    AIDL_ERROR(path) << "Failed to GetFullPathName";
     return false;
   }
   *absolute_path = buf;
@@ -59,8 +61,7 @@
 #else
 
   if (path.empty()) {
-    LOG(ERROR) << "Giving up on finding an absolute path to represent the "
-                  "empty string.";
+    AIDL_ERROR(path) << "Giving up on finding an absolute path to represent the empty string.";
     return false;
   }
   if (path[0] == OS_PATH_SEPARATOR) {
@@ -70,8 +71,8 @@
 
   char buf[4096];
   if (getcwd(buf, sizeof(buf)) == nullptr) {
-    LOG(ERROR) << "Path of current working directory does not fit in "
-               << sizeof(buf) << " bytes";
+    AIDL_ERROR(path) << "Path of current working directory does not fit in " << sizeof(buf)
+                     << " bytes";
     return false;
   }
 
@@ -138,8 +139,7 @@
 #endif
     // On darwin when you try to mkdir("/", ...) we get EISDIR.
     if (!success && (errno != EEXIST && errno != EISDIR)) {
-      LOG(ERROR) << "Error while creating " << base_dir << ": "
-                 << strerror(errno);
+      AIDL_ERROR(caller_base_dir) << "Error while creating " << base_dir << ": " << strerror(errno);
       return false;
     }
   }
@@ -201,7 +201,7 @@
 
 #else
 static void add_list_files(const string& dirname, vector<string>* result) {
-  CHECK(result != nullptr);
+  AIDL_FATAL_IF(result == nullptr, dirname);
   std::unique_ptr<DIR, decltype(&closedir)> dir(opendir(dirname.c_str()), closedir);
   if (dir != nullptr) {
     while (struct dirent* ent = readdir(dir.get())) {