commit 1e6e035c6a012f49b4bbcd5f03c80f5aec99e756
author Greg Kerr <kerrnel@chromium.org> Wed Oct 19 18:32:43 2016
committer chrome-bot <chrome-bot@chromium.org> Mon Oct 24 20:49:04 2016
tree 93cfe8d63e34c257a7d7fc4911e5878888928ce7
parent 6a311b197b777aee860789ae828aee86c4a20a22

Fix compiler warnings and build errors.

Fix new compiler warnings and build errors in ImageLoader.

BUG=chromium:630421
TEST=FEATURES="test" emerge-${BOARD} imageloader

Change-Id: I55ef7471d3116655b58849c1cefbd11337d6f367
Reviewed-on: https://chromium-review.googlesource.com/400838
Commit-Ready: Greg Kerr <kerrnel@chromium.org>
Tested-by: Greg Kerr <kerrnel@chromium.org>
Reviewed-by: Greg Kerr <kerrnel@chromium.org>

imageloader_main.cc

diff --git a/imageloader_main.cc b/imageloader_main.cc
index bd8802c..b6a0759 100644
--- a/imageloader_main.cc
+++ b/imageloader_main.cc
@@ -67,7 +67,12 @@
   DBus::BusDispatcher dispatcher;
   DBus::default_dispatcher = &dispatcher;
   DBus::Connection conn = DBus::Connection::SystemBus();
-  conn.request_name(imageloader::kImageLoaderName);
+  if (!conn.acquire_name(imageloader::kImageLoaderName)) {
+    LOG(ERROR) << "Failed to acquire dbus service with name: "
+               << imageloader::kImageLoaderName;
+    return 1;
+  }
+
   imageloader::ImageLoader helper(&conn, std::move(config));
 
   if (FLAGS_o) {

imageloader_unittest.cc

diff --git a/imageloader_unittest.cc b/imageloader_unittest.cc
index 401b54c..6e684fe 100644
--- a/imageloader_unittest.cc
+++ b/imageloader_unittest.cc
@@ -5,6 +5,7 @@
 #include "imageloader_impl.h"
 
 #include <dirent.h>
+#include <stdint.h>
 #include <stdlib.h>
 
 #include <algorithm>
@@ -53,7 +54,7 @@
     "\"version\":\"22.0.0.256\","
     "\"manifest-version\":1}";
 
-constexpr char kImageLoaderSig[] = {
+constexpr uint8_t kImageLoaderSig[] = {
     0x30, 0x46, 0x02, 0x21, 0x00, 0x86, 0x4f, 0x25, 0x51, 0x52, 0xb1, 0x79,
     0xa3, 0x3e, 0x9b, 0x08, 0x70, 0x10, 0x61, 0xca, 0x63, 0x37, 0x0c, 0xa2,
     0x9f, 0x4f, 0x21, 0xd7, 0x37, 0x05, 0x4e, 0x8d, 0x73, 0x39, 0x18, 0x98,
@@ -61,7 +62,7 @@
     0xe7, 0x4c, 0xa2, 0x5e, 0x00, 0xcb, 0x33, 0x43, 0x7b, 0x9d, 0x72, 0x3e,
     0x67, 0x39, 0x2c, 0xfb, 0x3a, 0xcb, 0x80, 0x2b, 0xc4, 0xca, 0xab, 0x8d};
 
-constexpr char kImageLoaderBadSig[] = {
+constexpr uint8_t kImageLoaderBadSig[] = {
     0x30, 0x44, 0x02, 0x20, 0x0a, 0x75, 0x49, 0xaf, 0x01, 0x3b, 0x48, 0x51,
     0x45, 0x74, 0x8b, 0x41, 0x64, 0x21, 0x83, 0xce, 0xf1, 0x78, 0x1d, 0xd0,
     0xa8, 0xd6, 0xae, 0x84, 0xf3, 0xc1, 0x3c, 0x3a, 0xee, 0xb4, 0x35, 0xb7,
@@ -187,11 +188,13 @@
   ImageLoaderImpl loader(GetConfig("/nonexistant"));
   EXPECT_TRUE(loader.ECVerify(
       base::StringPiece(kImageLoaderJSON),
-      base::StringPiece(kImageLoaderSig, sizeof(kImageLoaderSig))));
+      base::StringPiece(reinterpret_cast<const char*>(kImageLoaderSig),
+                        sizeof(kImageLoaderSig))));
 
   EXPECT_FALSE(loader.ECVerify(
       base::StringPiece(kImageLoaderJSON),
-      base::StringPiece(kImageLoaderBadSig, sizeof(kImageLoaderBadSig))));
+      base::StringPiece(reinterpret_cast<const char*>(kImageLoaderBadSig),
+                        sizeof(kImageLoaderBadSig))));
 }
 
 TEST_F(ImageLoaderTest, ManifestFingerPrint) {
@@ -312,7 +315,8 @@
 TEST_F(ImageLoaderTest, ParseManifest) {
   ImageLoaderImpl loader(GetConfig("/nonexistant"));
   ImageLoaderImpl::Manifest manifest;
-  std::string imageloader_sig(kImageLoaderSig, sizeof(kImageLoaderSig));
+  std::string imageloader_sig(reinterpret_cast<const char*>(kImageLoaderSig),
+                              sizeof(kImageLoaderSig));
   ASSERT_TRUE(loader.VerifyAndParseManifest(kImageLoaderJSON, imageloader_sig,
                                             &manifest));
   EXPECT_EQ(1, manifest.manifest_version);
@@ -323,11 +327,17 @@
   std::string bad_manifest = "{\"foo\":\"128.0.0.9\"}";
   ImageLoaderImpl::Manifest manifest2;
   EXPECT_FALSE(
-      loader.VerifyAndParseManifest(bad_manifest, kImageLoaderSig, &manifest2));
+      loader.VerifyAndParseManifest(
+          bad_manifest,
+          reinterpret_cast<const char*>(kImageLoaderSig),
+          &manifest2));
 
   ImageLoaderImpl::Manifest manifest3;
-  EXPECT_FALSE(loader.VerifyAndParseManifest(kImageLoaderJSON,
-                                             kImageLoaderBadSig, &manifest3));
+  EXPECT_FALSE(
+      loader.VerifyAndParseManifest(
+          kImageLoaderJSON,
+          reinterpret_cast<const char*>(kImageLoaderBadSig),
+          &manifest3));
 }
 
 TEST_F(ImageLoaderTest, MountValidImage) {