commit 9abb763fa3840d69cc1098c0233162557a7f99ea
author Ben Chan <benchan@chromium.org> Thu Aug 07 00:10:53 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Thu Aug 07 14:25:13 2014 +0000
tree 110e9711a1005fb3ddcf2aba114983508b612705
parent 6339785dd4561d6c80ded02077c5217b57f55689

update_engine: Use integer types from stdint.h

This CL replaces the deprecated int* and uint* types from
'base/basictypes.h' with the int*_t and uint*_t types from 'stdint.h'.

BUG=chromium:401356
TEST=`FEATURES=test emerge-$BOARD update_engine`

Change-Id: I658b34ad9e6feb938e0b569b72947a052ef8f8af
Reviewed-on: https://chromium-review.googlesource.com/211380
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Tested-by: Ben Chan <benchan@chromium.org>
Commit-Queue: Ben Chan <benchan@chromium.org>

utils_unittest.cc

diff --git a/utils_unittest.cc b/utils_unittest.cc
index a9ce287..aa1f919 100644
--- a/utils_unittest.cc
+++ b/utils_unittest.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include <errno.h>
+#include <stdint.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 
@@ -356,7 +357,7 @@
 
 namespace {
 void GetFileFormatTester(const string& expected,
-                         const vector<uint8>& contents) {
+                         const vector<uint8_t>& contents) {
   ScopedTempFile file;
   ASSERT_TRUE(utils::WriteFile(file.GetPath().c_str(),
                                reinterpret_cast<const char*>(contents.data()),
@@ -367,33 +368,33 @@
 
 TEST(UtilsTest, GetFileFormatTest) {
   EXPECT_EQ("File not found.", utils::GetFileFormat("/path/to/nowhere"));
-  GetFileFormatTester("data", vector<uint8>{1, 2, 3, 4, 5, 6, 7, 8});
-  GetFileFormatTester("ELF", vector<uint8>{0x7f, 0x45, 0x4c, 0x46});
+  GetFileFormatTester("data", vector<uint8_t>{1, 2, 3, 4, 5, 6, 7, 8});
+  GetFileFormatTester("ELF", vector<uint8_t>{0x7f, 0x45, 0x4c, 0x46});
 
   // Real tests from cros_installer on different boards.
   // ELF 32-bit LSB executable, Intel 80386
   GetFileFormatTester(
       "ELF 32-bit little-endian x86",
-      vector<uint8>{0x7f, 0x45, 0x4c, 0x46, 0x01, 0x01, 0x01, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x02, 0x00, 0x03, 0x00, 0x01, 0x00, 0x00, 0x00,
-                    0x90, 0x83, 0x04, 0x08, 0x34, 0x00, 0x00, 0x00});
+      vector<uint8_t>{0x7f, 0x45, 0x4c, 0x46, 0x01, 0x01, 0x01, 0x00,
+                      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                      0x02, 0x00, 0x03, 0x00, 0x01, 0x00, 0x00, 0x00,
+                      0x90, 0x83, 0x04, 0x08, 0x34, 0x00, 0x00, 0x00});
 
   // ELF 32-bit LSB executable, ARM
   GetFileFormatTester(
       "ELF 32-bit little-endian arm",
-      vector<uint8>{0x7f, 0x45, 0x4c, 0x46, 0x01, 0x01, 0x01, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x02, 0x00, 0x28, 0x00, 0x01, 0x00, 0x00, 0x00,
-                    0x85, 0x8b, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00});
+      vector<uint8_t>{0x7f, 0x45, 0x4c, 0x46, 0x01, 0x01, 0x01, 0x00,
+                      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                      0x02, 0x00, 0x28, 0x00, 0x01, 0x00, 0x00, 0x00,
+                      0x85, 0x8b, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00});
 
   // ELF 64-bit LSB executable, x86-64
   GetFileFormatTester(
       "ELF 64-bit little-endian x86-64",
-      vector<uint8>{0x7f, 0x45, 0x4c, 0x46, 0x02, 0x01, 0x01, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x02, 0x00, 0x3e, 0x00, 0x01, 0x00, 0x00, 0x00,
-                    0xb0, 0x04, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00});
+      vector<uint8_t>{0x7f, 0x45, 0x4c, 0x46, 0x02, 0x01, 0x01, 0x00,
+                      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                      0x02, 0x00, 0x3e, 0x00, 0x01, 0x00, 0x00, 0x00,
+                      0xb0, 0x04, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00});
 }
 
 namespace {