win: fix various warnings in minidump_system_info_writer_test.cc

minidump/minidump_system_info_writer_test.cc

 // Copyright 2014 The Crashpad Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 21 matching lines @@
 
 namespace crashpad {
 namespace test {
 namespace {
 
 void GetSystemInfoStream(const std::string& file_contents,
                          size_t csd_version_length,
                          const MINIDUMP_SYSTEM_INFO** system_info,
                          const MINIDUMP_STRING** csd_version) {
   // The expected number of bytes for the CSD version’s MINIDUMP_STRING::Buffer.
-  const size_t kCSDVersionBytes =
-      csd_version_length * sizeof(MINIDUMP_STRING::Buffer[0]);
+  MINIDUMP_STRING tmp = {0}; (void)tmp;

[Mark Mentovai, 2015/02/05 14:19:07]

We should bring ALLOW_UNUSED_LOCAL into mini_chromium and use that here. It’s
more self-documenting.

[scottmg, 2015/02/05 17:01:55]

Done.

+  const size_t kCSDVersionBytes = csd_version_length * sizeof(tmp.Buffer[0]);
   const size_t kCSDVersionBytesWithNUL =
-      kCSDVersionBytes + sizeof(MINIDUMP_STRING::Buffer[0]);
+      kCSDVersionBytes + sizeof(tmp.Buffer[0]);
 
   const size_t kDirectoryOffset = sizeof(MINIDUMP_HEADER);
   const size_t kSystemInfoStreamOffset =
       kDirectoryOffset + sizeof(MINIDUMP_DIRECTORY);
   const size_t kCSDVersionOffset =
       kSystemInfoStreamOffset + sizeof(MINIDUMP_SYSTEM_INFO);
   const size_t kFileSize =
       kCSDVersionOffset + sizeof(MINIDUMP_STRING) + kCSDVersionBytesWithNUL;
 
   ASSERT_EQ(kFileSize, file_contents.size());
@@ skipping 22 matching lines @@
   MinidumpFileWriter minidump_file_writer;
   auto system_info_writer = make_scoped_ptr(new MinidumpSystemInfoWriter());
 
   system_info_writer->SetCSDVersion(std::string());
 
   minidump_file_writer.AddStream(system_info_writer.Pass());
 
   StringFileWriter file_writer;
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&file_writer));
 
-  const MINIDUMP_SYSTEM_INFO* system_info;
-  const MINIDUMP_STRING* csd_version;
+  const MINIDUMP_SYSTEM_INFO* system_info = nullptr;
+  const MINIDUMP_STRING* csd_version = nullptr;
 
   ASSERT_NO_FATAL_FAILURE(
       GetSystemInfoStream(file_writer.string(), 0, &system_info, &csd_version));
 
   EXPECT_EQ(kMinidumpCPUArchitectureUnknown,
             system_info->ProcessorArchitecture);
   EXPECT_EQ(0u, system_info->ProcessorLevel);
   EXPECT_EQ(0u, system_info->ProcessorRevision);
   EXPECT_EQ(0u, system_info->NumberOfProcessors);
   EXPECT_EQ(0u, system_info->ProductType);
@@ skipping 49 matching lines @@
   system_info_writer->SetSuiteMask(kSuiteMask);
   system_info_writer->SetCPUX86VendorString(kCPUVendor);
   system_info_writer->SetCPUX86VersionAndFeatures(kCPUVersion, kCPUFeatures);
   system_info_writer->SetCPUX86AMDExtendedFeatures(kAMDFeatures);
 
   minidump_file_writer.AddStream(system_info_writer.Pass());
 
   StringFileWriter file_writer;
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&file_writer));
 
-  const MINIDUMP_SYSTEM_INFO* system_info;
-  const MINIDUMP_STRING* csd_version;
+  const MINIDUMP_SYSTEM_INFO* system_info = nullptr;
+  const MINIDUMP_STRING* csd_version = nullptr;
 
   ASSERT_NO_FATAL_FAILURE(GetSystemInfoStream(
       file_writer.string(), strlen(kCSDVersion), &system_info, &csd_version));
 
   EXPECT_EQ(kCPUArchitecture, system_info->ProcessorArchitecture);
   EXPECT_EQ(kCPULevel, system_info->ProcessorLevel);
   EXPECT_EQ(kCPURevision, system_info->ProcessorRevision);
   EXPECT_EQ(kCPUCount, system_info->NumberOfProcessors);
   EXPECT_EQ(kOSType, system_info->ProductType);
   EXPECT_EQ(kOSVersionMajor, system_info->MajorVersion);
@@ skipping 38 matching lines @@
   system_info_writer->SetOSVersion(
       kOSVersionMajor, kOSVersionMinor, kOSVersionBuild);
   system_info_writer->SetCSDVersion(kCSDVersion);
   system_info_writer->SetCPUOtherFeatures(kCPUFeatures[0], kCPUFeatures[1]);
 
   minidump_file_writer.AddStream(system_info_writer.Pass());
 
   StringFileWriter file_writer;
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&file_writer));
 
-  const MINIDUMP_SYSTEM_INFO* system_info;
+  const MINIDUMP_SYSTEM_INFO* system_info = nullptr;
   const MINIDUMP_STRING* csd_version;
 
   ASSERT_NO_FATAL_FAILURE(GetSystemInfoStream(
       file_writer.string(), strlen(kCSDVersion), &system_info, &csd_version));
 
   EXPECT_EQ(kCPUArchitecture, system_info->ProcessorArchitecture);
   EXPECT_EQ(kCPULevel, system_info->ProcessorLevel);
   EXPECT_EQ(kCPURevision, system_info->ProcessorRevision);
   EXPECT_EQ(kCPUCount, system_info->NumberOfProcessors);
   EXPECT_EQ(kOSType, system_info->ProductType);
@@ skipping 21 matching lines @@
   system_info_writer->SetCPUArchitecture(kCPUArchitecture);
   system_info_writer->SetCPUX86Vendor(
       kCPUVendor[0], kCPUVendor[1], kCPUVendor[2]);
   system_info_writer->SetCSDVersion(std::string());
 
   minidump_file_writer.AddStream(system_info_writer.Pass());
 
   StringFileWriter file_writer;
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&file_writer));
 
-  const MINIDUMP_SYSTEM_INFO* system_info;
+  const MINIDUMP_SYSTEM_INFO* system_info = nullptr;
   const MINIDUMP_STRING* csd_version;
 
   ASSERT_NO_FATAL_FAILURE(
       GetSystemInfoStream(file_writer.string(), 0, &system_info, &csd_version));
 
   EXPECT_EQ(kCPUArchitecture, system_info->ProcessorArchitecture);
   EXPECT_EQ(0u, system_info->ProcessorLevel);
   EXPECT_EQ(kCPUVendor[0], system_info->Cpu.X86CpuInfo.VendorId[0]);
   EXPECT_EQ(kCPUVendor[1], system_info->Cpu.X86CpuInfo.VendorId[1]);
   EXPECT_EQ(kCPUVendor[2], system_info->Cpu.X86CpuInfo.VendorId[2]);
   EXPECT_EQ(0u, system_info->Cpu.X86CpuInfo.VersionInformation);
 }
 
 TEST(MinidumpSystemInfoWriter, InitializeFromSnapshot_X86) {
   MINIDUMP_SYSTEM_INFO expect_system_info = {};
 
   const uint16_t kCPUFamily = 6;
   const uint8_t kCPUModel = 70;
   const uint8_t kCPUStepping = 1;
 
   const uint8_t kCPUBasicFamily =
-      std::min(kCPUFamily, implicit_cast<uint16_t>(15));
+      static_cast<uint8_t>(std::min(kCPUFamily, static_cast<uint16_t>(15)));
   const uint8_t kCPUExtendedFamily = kCPUFamily - kCPUBasicFamily;
 
   // These checks ensure that even if the constants above change, they represent
   // something that can legitimately be encoded in the form used by cpuid 1 eax.
   EXPECT_LE(kCPUFamily, 270);
   EXPECT_LE(kCPUStepping, 15);
   EXPECT_TRUE(kCPUBasicFamily == 6 || kCPUBasicFamily == 15 || kCPUModel <= 15);
 
   const uint8_t kCPUBasicModel = kCPUModel & 0xf;
   const uint8_t kCPUExtendedModel = kCPUModel >> 4;
@@ skipping 37 matching lines @@
 
   auto system_info_writer = make_scoped_ptr(new MinidumpSystemInfoWriter());
   system_info_writer->InitializeFromSnapshot(&system_snapshot);
 
   MinidumpFileWriter minidump_file_writer;
   minidump_file_writer.AddStream(system_info_writer.Pass());
 
   StringFileWriter file_writer;
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&file_writer));
 
-  const MINIDUMP_SYSTEM_INFO* system_info;
-  const MINIDUMP_STRING* csd_version;
+  const MINIDUMP_SYSTEM_INFO* system_info = nullptr;
+  const MINIDUMP_STRING* csd_version = nullptr;
   ASSERT_NO_FATAL_FAILURE(GetSystemInfoStream(file_writer.string(),
                                               strlen(kOSVersionBuild),
                                               &system_info,
                                               &csd_version));
 
   EXPECT_EQ(expect_system_info.ProcessorArchitecture,
             system_info->ProcessorArchitecture);
   EXPECT_EQ(expect_system_info.ProcessorLevel, system_info->ProcessorLevel);
   EXPECT_EQ(expect_system_info.ProcessorRevision,
             system_info->ProcessorRevision);
@@ skipping 73 matching lines @@
 
   auto system_info_writer = make_scoped_ptr(new MinidumpSystemInfoWriter());
   system_info_writer->InitializeFromSnapshot(&system_snapshot);
 
   MinidumpFileWriter minidump_file_writer;
   minidump_file_writer.AddStream(system_info_writer.Pass());
 
   StringFileWriter file_writer;
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&file_writer));
 
-  const MINIDUMP_SYSTEM_INFO* system_info;
-  const MINIDUMP_STRING* csd_version;
+  const MINIDUMP_SYSTEM_INFO* system_info = nullptr;
+  const MINIDUMP_STRING* csd_version = nullptr;
   ASSERT_NO_FATAL_FAILURE(GetSystemInfoStream(file_writer.string(),
                                               strlen(kOSVersionBuild),
                                               &system_info,
                                               &csd_version));
 
   EXPECT_EQ(expect_system_info.ProcessorArchitecture,
             system_info->ProcessorArchitecture);
   EXPECT_EQ(expect_system_info.ProcessorLevel, system_info->ProcessorLevel);
   EXPECT_EQ(expect_system_info.ProcessorRevision,
             system_info->ProcessorRevision);
@@ skipping 21 matching lines @@
   minidump_file_writer.AddStream(system_info_writer.Pass());
 
   StringFileWriter file_writer;
   ASSERT_DEATH(minidump_file_writer.WriteEverything(&file_writer),
                "csd_version_");
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace crashpad