Treat warnings as error and fix most level 4 warnings in the breakpad windows client projects.

Some of the lint errors in the files touched by this change were also fixed.

BUG=533
Review URL: https://breakpad.appspot.com/601002

git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1189 4c0a9323-5329-0410-9bdc-e9ce6186880e

4 files changed, 47 insertions, 38 deletions

diff --git a/src/client/windows/unittests/exception_handler_death_test.cc b/src/client/windows/unittests/exception_handler_death_test.cc
index ba7be920..3a16e525 100644
--- a/src/client/windows/unittests/exception_handler_death_test.cc
+++ b/src/client/windows/unittests/exception_handler_death_test.cc
@@ -124,17 +124,19 @@ TEST_F(ExceptionHandlerDeathTest, InProcTest) {
   // the semantics of the exception handler being inherited/not
   // inherited across CreateProcess().
   ASSERT_TRUE(DoesPathExist(temp_path_));
-  google_breakpad::ExceptionHandler *exc =
-    new google_breakpad::ExceptionHandler(
-    temp_path_, NULL, &MinidumpWrittenCallback, NULL,
-    google_breakpad::ExceptionHandler::HANDLER_ALL);
+  scoped_ptr<google_breakpad::ExceptionHandler> exc(
+      new google_breakpad::ExceptionHandler(
+          temp_path_,
+          NULL,
+          &MinidumpWrittenCallback,
+          NULL,
+          google_breakpad::ExceptionHandler::HANDLER_ALL));
 
   // Disable GTest SEH handler
   testing::DisableExceptionHandlerInScope disable_exception_handler;
 
   int *i = NULL;
   ASSERT_DEATH((*i)++, kSuccessIndicator);
-  delete exc;
 }
 
 static bool gDumpCallbackCalled = false;
@@ -147,26 +149,24 @@ void clientDumpCallback(void *dump_context,
 
 void ExceptionHandlerDeathTest::DoCrashAccessViolation(
     const OutOfProcGuarantee out_of_proc_guarantee) {
-  google_breakpad::ExceptionHandler *exc = NULL;
+  scoped_ptr<google_breakpad::ExceptionHandler> exc;
 
   if (out_of_proc_guarantee == OUT_OF_PROC_GUARANTEED) {
-    google_breakpad::CrashGenerationClient *client = 
+    google_breakpad::CrashGenerationClient *client =
         new google_breakpad::CrashGenerationClient(kPipeName,
                                                    MiniDumpNormal,
                                                    NULL);  // custom_info
     ASSERT_TRUE(client->Register());
-    exc = new google_breakpad::ExceptionHandler(
+    exc.reset(new google_breakpad::ExceptionHandler(
         temp_path_,
         NULL,   // filter
         NULL,   // callback
         NULL,   // callback_context
         google_breakpad::ExceptionHandler::HANDLER_ALL,
-        MiniDumpNormal,
-        client,
-        NULL);  // custom_info
+        client));
   } else {
     ASSERT_TRUE(out_of_proc_guarantee == OUT_OF_PROC_BEST_EFFORT);
-    exc = new google_breakpad::ExceptionHandler(
+    exc.reset(new google_breakpad::ExceptionHandler(
         temp_path_,
         NULL,   // filter
         NULL,   // callback
@@ -174,7 +174,7 @@ void ExceptionHandlerDeathTest::DoCrashAccessViolation(
         google_breakpad::ExceptionHandler::HANDLER_ALL,
         MiniDumpNormal,
         kPipeName,
-        NULL);  // custom_info
+        NULL));  // custom_info
   }
 
   // Disable GTest SEH handler
@@ -302,17 +302,20 @@ wstring find_minidump_in_directory(const wstring &directory) {
       filename = directory + L"\\" + find_data.cFileName;
       break;
     }
-  } while(FindNextFile(find_handle, &find_data));
+  } while (FindNextFile(find_handle, &find_data));
   FindClose(find_handle);
   return filename;
 }
 
 TEST_F(ExceptionHandlerDeathTest, InstructionPointerMemory) {
   ASSERT_TRUE(DoesPathExist(temp_path_));
-  google_breakpad::ExceptionHandler *exc =
+  scoped_ptr<google_breakpad::ExceptionHandler> exc(
       new google_breakpad::ExceptionHandler(
-          temp_path_, NULL, NULL, NULL,
-          google_breakpad::ExceptionHandler::HANDLER_ALL);
+          temp_path_,
+          NULL,
+          NULL,
+          NULL,
+          google_breakpad::ExceptionHandler::HANDLER_ALL));
 
   // Disable GTest SEH handler
   testing::DisableExceptionHandlerInScope disable_exception_handler;
@@ -333,7 +336,7 @@ TEST_F(ExceptionHandlerDeathTest, InstructionPointerMemory) {
   // minidump should contain 128 bytes on either side of the
   // instruction pointer.
   memcpy(memory + kOffset, instructions, sizeof(instructions));
-  
+
   // Now execute the instructions, which should crash.
   typedef void (*void_function)(void);
   void_function memory_function =
@@ -382,11 +385,10 @@ TEST_F(ExceptionHandlerDeathTest, InstructionPointerMemory) {
     uint8_t suffix_bytes[kMemorySize - kOffset - sizeof(instructions)];
     memset(prefix_bytes, 0, sizeof(prefix_bytes));
     memset(suffix_bytes, 0, sizeof(suffix_bytes));
-    EXPECT_TRUE(memcmp(bytes, prefix_bytes, sizeof(prefix_bytes)) == 0);
-    EXPECT_TRUE(memcmp(bytes + kOffset, instructions,
-                       sizeof(instructions)) == 0);
-    EXPECT_TRUE(memcmp(bytes + kOffset + sizeof(instructions),
-                       suffix_bytes, sizeof(suffix_bytes)) == 0);
+    EXPECT_EQ(0, memcmp(bytes, prefix_bytes, sizeof(prefix_bytes)));
+    EXPECT_EQ(0, memcmp(bytes + kOffset, instructions, sizeof(instructions)));
+    EXPECT_EQ(0, memcmp(bytes + kOffset + sizeof(instructions),
+                        suffix_bytes, sizeof(suffix_bytes)));
   }
 
   DeleteFileW(minidump_filename_wide.c_str());
@@ -394,10 +396,13 @@ TEST_F(ExceptionHandlerDeathTest, InstructionPointerMemory) {
 
 TEST_F(ExceptionHandlerDeathTest, InstructionPointerMemoryMinBound) {
   ASSERT_TRUE(DoesPathExist(temp_path_));
-  google_breakpad::ExceptionHandler *exc =
+  scoped_ptr<google_breakpad::ExceptionHandler> exc(
       new google_breakpad::ExceptionHandler(
-          temp_path_, NULL, NULL, NULL,
-          google_breakpad::ExceptionHandler::HANDLER_ALL);
+          temp_path_,
+          NULL,
+          NULL,
+          NULL,
+          google_breakpad::ExceptionHandler::HANDLER_ALL));
 
   // Disable GTest SEH handler
   testing::DisableExceptionHandlerInScope disable_exception_handler;
@@ -426,7 +431,7 @@ TEST_F(ExceptionHandlerDeathTest, InstructionPointerMemoryMinBound) {
   // minidump should contain 128 bytes on either side of the
   // instruction pointer.
   memcpy(memory + kOffset, instructions, sizeof(instructions));
-  
+
   // Now execute the instructions, which should crash.
   typedef void (*void_function)(void);
   void_function memory_function =
@@ -484,10 +489,13 @@ TEST_F(ExceptionHandlerDeathTest, InstructionPointerMemoryMinBound) {
 
 TEST_F(ExceptionHandlerDeathTest, InstructionPointerMemoryMaxBound) {
   ASSERT_TRUE(DoesPathExist(temp_path_));
-  google_breakpad::ExceptionHandler *exc =
+  scoped_ptr<google_breakpad::ExceptionHandler> exc(
       new google_breakpad::ExceptionHandler(
-          temp_path_, NULL, NULL, NULL,
-          google_breakpad::ExceptionHandler::HANDLER_ALL);
+          temp_path_,
+          NULL,
+          NULL,
+          NULL,
+          google_breakpad::ExceptionHandler::HANDLER_ALL));
 
   // Disable GTest SEH handler
   testing::DisableExceptionHandlerInScope disable_exception_handler;
@@ -511,7 +519,7 @@ TEST_F(ExceptionHandlerDeathTest, InstructionPointerMemoryMaxBound) {
 
   // Write some instructions that will crash.
   memcpy(memory + kOffset, instructions, sizeof(instructions));
-  
+
   // Now execute the instructions, which should crash.
   typedef void (*void_function)(void);
   void_function memory_function =
@@ -559,9 +567,9 @@ TEST_F(ExceptionHandlerDeathTest, InstructionPointerMemoryMaxBound) {
 
     uint8_t prefix_bytes[kPrefixSize];
     memset(prefix_bytes, 0, sizeof(prefix_bytes));
-    EXPECT_TRUE(memcmp(bytes, prefix_bytes, sizeof(prefix_bytes)) == 0);
-    EXPECT_TRUE(memcmp(bytes + kPrefixSize,
-                       instructions, sizeof(instructions)) == 0);
+    EXPECT_EQ(0, memcmp(bytes, prefix_bytes, sizeof(prefix_bytes)));
+    EXPECT_EQ(0, memcmp(bytes + kPrefixSize,
+                        instructions, sizeof(instructions)));
   }
 
   DeleteFileW(minidump_filename_wide.c_str());
diff --git a/src/client/windows/unittests/exception_handler_nesting_test.cc b/src/client/windows/unittests/exception_handler_nesting_test.cc
index 0cf30013..3ae1d7cd 100755
--- a/src/client/windows/unittests/exception_handler_nesting_test.cc
+++ b/src/client/windows/unittests/exception_handler_nesting_test.cc
@@ -149,7 +149,7 @@ void InstallExceptionHandlerAndCrash(bool install_filter,
   ASSERT_TRUE(DoesPathExist(temp_path));
   google_breakpad::ExceptionHandler exc(
       temp_path,
-      install_filter ? 
+      install_filter ?
         (filter_return_value ?
           &CrashHandlerFilter<true> :
           &CrashHandlerFilter<false>) :
@@ -178,7 +178,7 @@ TEST(AssertDeathSanity, Regex) {
       std::string(kFoo) +
       std::string(kEndOfLine));
 
-  ASSERT_DEATH(DoCrash(kBar), 
+  ASSERT_DEATH(DoCrash(kBar),
     std::string(kStartOfLine) +
       std::string(kBar) +
       std::string(kEndOfLine));
diff --git a/src/client/windows/unittests/exception_handler_test.cc b/src/client/windows/unittests/exception_handler_test.cc
index 7b50e301..55275323 100644
--- a/src/client/windows/unittests/exception_handler_test.cc
+++ b/src/client/windows/unittests/exception_handler_test.cc
@@ -390,7 +390,7 @@ TEST_F(ExceptionHandlerTest, WriteMinidumpTest) {
   // Read the minidump and verify some info.
   Minidump minidump(minidump_filename);
   ASSERT_TRUE(minidump.Read());
-  //TODO(ted): more comprehensive tests...
+  // TODO(ted): more comprehensive tests...
 }
 
 // Test that an additional memory region can be included in the minidump.
diff --git a/src/client/windows/unittests/minidump_test.cc b/src/client/windows/unittests/minidump_test.cc
index 62f212f8..e3097f28 100644
--- a/src/client/windows/unittests/minidump_test.cc
+++ b/src/client/windows/unittests/minidump_test.cc
@@ -161,7 +161,8 @@ bool HasFileInfo(const std::wstring& file_path) {
 }
 
 TEST_F(MinidumpTest, Version) {
-  API_VERSION* version = ::ImagehlpApiVersion();
+  // Loads DbgHelp.dll in process
+  ImagehlpApiVersion();
 
   HMODULE dbg_help = ::GetModuleHandle(L"dbghelp.dll");
   ASSERT_TRUE(dbg_help != NULL);