OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2012 The Chromium Authors. All rights reserved. | 2 * Copyright (c) 2012 The Chromium Authors. All rights reserved. |
3 * Use of this source code is governed by a BSD-style license that can be | 3 * Use of this source code is governed by a BSD-style license that can be |
4 * found in the LICENSE file. | 4 * found in the LICENSE file. |
5 */ | 5 */ |
6 | 6 |
7 #define NACL_LOG_MODULE_NAME "Plugin::ServiceRuntime" | 7 #define NACL_LOG_MODULE_NAME "Plugin::ServiceRuntime" |
8 | 8 |
9 #include "native_client/src/trusted/plugin/service_runtime.h" | 9 #include "native_client/src/trusted/plugin/service_runtime.h" |
10 | 10 |
(...skipping 828 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
839 | 839 |
840 void ServiceRuntime::set_exit_status(int exit_status) { | 840 void ServiceRuntime::set_exit_status(int exit_status) { |
841 nacl::MutexLocker take(&mu_); | 841 nacl::MutexLocker take(&mu_); |
842 exit_status_ = exit_status & 0xff; | 842 exit_status_ = exit_status & 0xff; |
843 } | 843 } |
844 | 844 |
845 nacl::string ServiceRuntime::GetCrashLogOutput() { | 845 nacl::string ServiceRuntime::GetCrashLogOutput() { |
846 if (NULL != subprocess_.get()) { | 846 if (NULL != subprocess_.get()) { |
847 return subprocess_->GetCrashLogOutput(); | 847 return subprocess_->GetCrashLogOutput(); |
848 } else { | 848 } else { |
849 return ""; | 849 return std::string(); |
850 } | 850 } |
851 } | 851 } |
852 | 852 |
853 } // namespace plugin | 853 } // namespace plugin |
OLD | NEW |