Makes gtest compile without warning with gcc 4.0.3 and -Wall -Wextra.

git-svn-id: http://googletest.googlecode.com/svn/trunk@226 861a406c-534a-0410-8894-cb66d6ee9925

4 files changed, 11 insertions, 10 deletions

diff --git a/include/gtest/internal/gtest-param-util.h b/include/gtest/internal/gtest-param-util.h
index 5559ab4..34361ab 100644
--- a/include/gtest/internal/gtest-param-util.h
+++ b/include/gtest/internal/gtest-param-util.h
@@ -483,8 +483,8 @@ class ParameterizedTestCaseInfo : public ParameterizedTestCaseInfoBase {
   // about a generator.
   int AddTestCaseInstantiation(const char* instantiation_name,
                                GeneratorCreationFunc* func,
-                               const char* file,
-                               int line) {
+                               const char* /* file */,
+                               int /* line */) {
     instantiations_.push_back(::std::make_pair(instantiation_name, func));
     return 0;  // Return value used only to run this method in namespace scope.
   }
diff --git a/make/Makefile b/make/Makefile
index bf7e978..2d8806e 100644
--- a/make/Makefile
+++ b/make/Makefile
@@ -23,7 +23,7 @@ USER_DIR = ../samples
 CPPFLAGS += -I$(GTEST_DIR) -I$(GTEST_DIR)/include
 
 # Flags passed to the C++ compiler.
-CXXFLAGS += -g
+CXXFLAGS += -g -Wall -Wextra
 
 # All tests produced by this Makefile.  Remember to add new tests you
 # created to the list.
diff --git a/src/gtest-death-test.cc b/src/gtest-death-test.cc
index 18eaaec..5e7eca0 100644
--- a/src/gtest-death-test.cc
+++ b/src/gtest-death-test.cc
@@ -945,7 +945,7 @@ bool StackGrowsDown() {
 // wrong.
 static pid_t ExecDeathTestFork(char* const* argv, int close_fd) {
   ExecDeathTestArgs args = { argv, close_fd };
-  pid_t child_pid;
+  pid_t child_pid = -1;
 
 #if GTEST_HAS_CLONE
   const bool use_fork = GTEST_FLAG(death_test_use_fork);
diff --git a/src/gtest-filepath.cc b/src/gtest-filepath.cc
index 32fd3bc..d0cc5ff 100644
--- a/src/gtest-filepath.cc
+++ b/src/gtest-filepath.cc
@@ -33,6 +33,7 @@
 #include <gtest/internal/gtest-port.h>
 
 #include <stdlib.h>
+#include <string.h>
 
 #ifdef _WIN32_WCE
 #include <windows.h>
@@ -166,20 +167,19 @@ FilePath FilePath::ConcatPaths(const FilePath& directory,
 // Returns true if pathname describes something findable in the file-system,
 // either a file, directory, or whatever.
 bool FilePath::FileOrDirectoryExists() const {
-#if GTEST_OS_WINDOWS
 #ifdef _WIN32_WCE
   LPCWSTR unicode = String::AnsiToUtf16(pathname_.c_str());
   const DWORD attributes = GetFileAttributes(unicode);
   delete [] unicode;
   return attributes != kInvalidFileAttributes;
-#else
+#elif GTEST_OS_WINDOWS
   struct _stat file_stat = {};
   return _stat(pathname_.c_str(), &file_stat) == 0;
-#endif  // _WIN32_WCE
 #else
-  struct stat file_stat = {};
+  struct stat file_stat;
+  memset(&file_stat, 0, sizeof(file_stat));
   return stat(pathname_.c_str(), &file_stat) == 0;
-#endif  // GTEST_OS_WINDOWS
+#endif  // _WIN32_WCE
 }
 
 // Returns true if pathname describes a directory in the file-system
@@ -205,7 +205,8 @@ bool FilePath::DirectoryExists() const {
       (_S_IFDIR & file_stat.st_mode) != 0;
 #endif  // _WIN32_WCE
 #else
-  struct stat file_stat = {};
+  struct stat file_stat;
+  memset(&file_stat, 0, sizeof(file_stat));
   result = stat(pathname_.c_str(), &file_stat) == 0 &&
       S_ISDIR(file_stat.st_mode);
 #endif  // GTEST_OS_WINDOWS