diff --git a/sandboxed_api/sandbox2/forkingclient.cc b/sandboxed_api/sandbox2/forkingclient.cc index c7ce23e..4affc66 100644 --- a/sandboxed_api/sandbox2/forkingclient.cc +++ b/sandboxed_api/sandbox2/forkingclient.cc @@ -42,7 +42,7 @@ pid_t ForkingClient::WaitAndFork() { } pid_t pid = fork_server_worker_->ServeRequest(); if (pid == -1 && fork_server_worker_->IsTerminated()) { - SAPI_RAW_VLOG(1, "ForkServer Comms closed. Exiting"); + VLOG(1) << "ForkServer Comms closed. Exiting"; exit(0); } return pid; diff --git a/sandboxed_api/sandbox2/monitor_unotify.cc b/sandboxed_api/sandbox2/monitor_unotify.cc index 8f36ec0..1f85ab0 100644 --- a/sandboxed_api/sandbox2/monitor_unotify.cc +++ b/sandboxed_api/sandbox2/monitor_unotify.cc @@ -231,15 +231,11 @@ void UnotifyMonitor::SetExitStatusFromStatusPipe() { int code, status; rusage usage; - SAPI_RAW_PCHECK( - read(process_.status_fd.get(), &code, sizeof(code)) == sizeof(code), - "read"); - SAPI_RAW_PCHECK( - read(process_.status_fd.get(), &status, sizeof(status)) == sizeof(status), - "read"); - SAPI_RAW_PCHECK( - read(process_.status_fd.get(), &usage, sizeof(usage)) == sizeof(usage), - "read"); + PCHECK(read(process_.status_fd.get(), &code, sizeof(code)) == sizeof(code)); + PCHECK(read(process_.status_fd.get(), &status, sizeof(status)) == + sizeof(status)); + PCHECK(read(process_.status_fd.get(), &usage, sizeof(usage)) == + sizeof(usage)); result_.SetRUsageSandboxee(usage); if (code == CLD_EXITED) {