diff options
| author | Joshua Haberman <jhaberman@gmail.com> | 2016-02-16 16:47:46 -0800 |
|---|---|---|
| committer | Joshua Haberman <jhaberman@gmail.com> | 2016-02-16 16:47:46 -0800 |
| commit | d41db75dcbbad0a7c3af5fb9f3b071cf6084243d (patch) | |
| tree | df579dfcd102a17cbf44063dff51f469fe4e2f15 | |
| parent | 8fc045d8d29732adfad986900363e907fd0f7e8f (diff) | |
| parent | 914605c4dcf7b920ddeb4f66dc0229fa9ac4e709 (diff) | |
| download | protobuf-d41db75dcbbad0a7c3af5fb9f3b071cf6084243d.tar.gz protobuf-d41db75dcbbad0a7c3af5fb9f3b071cf6084243d.tar.bz2 protobuf-d41db75dcbbad0a7c3af5fb9f3b071cf6084243d.zip | |
Merge pull request #260 from ejsd1989/issue-#242
Removes redundant null pointer checks checks
| -rw-r--r-- | src/google/protobuf/compiler/cpp/cpp_bootstrap_unittest.cc | 2 | ||||
| -rw-r--r-- | src/google/protobuf/io/gzip_stream.cc | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/google/protobuf/compiler/cpp/cpp_bootstrap_unittest.cc b/src/google/protobuf/compiler/cpp/cpp_bootstrap_unittest.cc index c3e9fe74..47729e1c 100644 --- a/src/google/protobuf/compiler/cpp/cpp_bootstrap_unittest.cc +++ b/src/google/protobuf/compiler/cpp/cpp_bootstrap_unittest.cc @@ -107,7 +107,7 @@ class MockGeneratorContext : public GeneratorContext { virtual io::ZeroCopyOutputStream* Open(const string& filename) { string** map_slot = &files_[filename]; - if (*map_slot != NULL) delete *map_slot; + delete *map_slot; *map_slot = new string; return new io::StringOutputStream(*map_slot); diff --git a/src/google/protobuf/io/gzip_stream.cc b/src/google/protobuf/io/gzip_stream.cc index 1be6c863..9c621b6a 100644 --- a/src/google/protobuf/io/gzip_stream.cc +++ b/src/google/protobuf/io/gzip_stream.cc @@ -241,9 +241,7 @@ void GzipOutputStream::Init(ZeroCopyOutputStream* sub_stream, GzipOutputStream::~GzipOutputStream() { Close(); - if (input_buffer_ != NULL) { - operator delete(input_buffer_); - } + operator delete(input_buffer_); } // private |