Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(300)

Unified Diff: src/platform/update_engine/update_engine_client.cc

Issue 1700018: AU: FilesystemCopierAction: copy bit-exactly (Closed) Base URL: ssh://git@chromiumos-git/chromeos
Patch Set: fixes for review Created 10 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/platform/update_engine/testrunner.cc ('k') | src/platform/update_engine/utils.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/platform/update_engine/update_engine_client.cc
diff --git a/src/platform/update_engine/update_engine_client.cc b/src/platform/update_engine/update_engine_client.cc
index 1e273ed036bcfe28104cc9636c627c4885974429..bed72056f073283c57caea08210f6cc7e5a75b2a 100644
--- a/src/platform/update_engine/update_engine_client.cc
+++ b/src/platform/update_engine/update_engine_client.cc
@@ -16,6 +16,7 @@ extern "C" {
using chromeos_update_engine::kUpdateEngineServiceName;
using chromeos_update_engine::kUpdateEngineServicePath;
using chromeos_update_engine::kUpdateEngineServiceInterface;
+using chromeos_update_engine::utils::GetGErrorMessage;
DEFINE_bool(status, false, "Print the status to stdout.");
DEFINE_bool(force_update, false,
@@ -25,12 +26,6 @@ DEFINE_bool(check_for_update, false,
namespace {
-const char* GetErrorMessage(const GError* error) {
- if (!error)
- return "Unknown error.";
- return error->message;
-}
-
bool GetStatus() {
DBusGConnection *bus;
DBusGProxy *proxy;
@@ -46,7 +41,7 @@ bool GetStatus() {
kUpdateEngineServiceInterface,
&error);
if (!proxy) {
- LOG(FATAL) << "Error getting proxy: " << GetErrorMessage(error);
+ LOG(FATAL) << "Error getting proxy: " << GetGErrorMessage(error);
}
gint64 last_checked_time = 0;
@@ -64,7 +59,7 @@ bool GetStatus() {
&new_size,
&error);
if (rc == FALSE) {
- LOG(INFO) << "Error getting status: " << GetErrorMessage(error);
+ LOG(INFO) << "Error getting status: " << GetGErrorMessage(error);
}
printf("LAST_CHECKED_TIME=%" PRIi64 "\nPROGRESS=%f\nCURRENT_OP=%s\n"
"NEW_VERSION=%s\nNEW_SIZE=%" PRIi64 "\n",
« no previous file with comments | « src/platform/update_engine/testrunner.cc ('k') | src/platform/update_engine/utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698