diff options
Diffstat (limited to 'adb/adb.cpp')
| -rw-r--r-- | adb/adb.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/adb/adb.cpp b/adb/adb.cpp index 791899e59..62e8908c0 100644 --- a/adb/adb.cpp +++ b/adb/adb.cpp @@ -633,11 +633,11 @@ static void ReportServerStartupFailure(pid_t pid) { fprintf(stderr, "Full server startup log: %s\n", GetLogFilePath().c_str()); fprintf(stderr, "Server had pid: %d\n", pid); - unique_fd fd(adb_open(GetLogFilePath().c_str(), O_RDONLY)); + android::base::unique_fd fd(unix_open(GetLogFilePath().c_str(), O_RDONLY)); if (fd == -1) return; // Let's not show more than 128KiB of log... - adb_lseek(fd, -128 * 1024, SEEK_END); + unix_lseek(fd, -128 * 1024, SEEK_END); std::string content; if (!android::base::ReadFdToString(fd, &content)) return; @@ -827,7 +827,7 @@ int launch_server(const std::string& socket_spec) { memcmp(temp, expected, expected_length) == 0) { got_ack = true; } else { - ReportServerStartupFailure(GetProcessId(process_handle.get())); + ReportServerStartupFailure(pinfo.dwProcessId); return -1; } } else { |