diff options
author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-13 13:43:42 +0000 |
---|---|---|
committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-13 13:43:42 +0000 |
commit | 659f73fa7b0a91ceef30e89fff34629f39853761 (patch) | |
tree | 54856047a10c8ba93f82c725cb0e3ee5283e707d /net | |
parent | b2be7a6889ea1af900760b6e69e22152f652e950 (diff) | |
download | chromium_src-659f73fa7b0a91ceef30e89fff34629f39853761.zip chromium_src-659f73fa7b0a91ceef30e89fff34629f39853761.tar.gz chromium_src-659f73fa7b0a91ceef30e89fff34629f39853761.tar.bz2 |
Turn NULL used as int to 0.
(Excluding chrome/browser/...)
Landing patch for Jacob Mandelson. Original review: http://codereview.chromium.org/195067
BUG=none
TEST=base_unittests & app_unittests
Review URL: http://codereview.chromium.org/267076
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28810 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r-- | net/base/directory_lister.cc | 4 | ||||
-rw-r--r-- | net/socket/ssl_test_util.cc | 11 |
2 files changed, 8 insertions, 7 deletions
diff --git a/net/base/directory_lister.cc b/net/base/directory_lister.cc index 7ea862f..8204fd8 100644 --- a/net/base/directory_lister.cc +++ b/net/base/directory_lister.cc @@ -55,7 +55,7 @@ DirectoryLister::DirectoryLister(const FilePath& dir, : dir_(dir), delegate_(delegate), message_loop_(NULL), - thread_(NULL), + thread_(kNullThreadHandle), canceled_(false) { DCHECK(!dir.value().empty()); } @@ -88,7 +88,7 @@ void DirectoryLister::Cancel() { if (thread_) { PlatformThread::Join(thread_); - thread_ = NULL; + thread_ = kNullThreadHandle; } } diff --git a/net/socket/ssl_test_util.cc b/net/socket/ssl_test_util.cc index 763031f..c0ef832 100644 --- a/net/socket/ssl_test_util.cc +++ b/net/socket/ssl_test_util.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2009 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -136,7 +136,8 @@ const int TestServerLauncher::kBadHTTPSPort = 9666; // The issuer name of the cert that should be trusted for the test to work. const wchar_t TestServerLauncher::kCertIssuerName[] = L"Test CA"; -TestServerLauncher::TestServerLauncher() : process_handle_(NULL), +TestServerLauncher::TestServerLauncher() : process_handle_( + base::kNullProcessHandle), forking_(false), connection_attempts_(10), connection_timeout_(1000) @@ -149,7 +150,7 @@ TestServerLauncher::TestServerLauncher() : process_handle_(NULL), TestServerLauncher::TestServerLauncher(int connection_attempts, int connection_timeout) - : process_handle_(NULL), + : process_handle_(base::kNullProcessHandle), forking_(false), connection_attempts_(connection_attempts), connection_timeout_(connection_timeout) @@ -331,7 +332,7 @@ bool TestServerLauncher::WaitToFinish(int timeout_ms) { bool ret = base::WaitForSingleProcess(process_handle_, timeout_ms); if (ret) { base::CloseProcessHandle(process_handle_); - process_handle_ = NULL; + process_handle_ = base::kNullProcessHandle; LOG(INFO) << "Finished."; } else { LOG(INFO) << "Timed out."; @@ -346,7 +347,7 @@ bool TestServerLauncher::Stop() { bool ret = base::KillProcess(process_handle_, 1, true); if (ret) { base::CloseProcessHandle(process_handle_); - process_handle_ = NULL; + process_handle_ = base::kNullProcessHandle; LOG(INFO) << "Stopped."; } else { LOG(INFO) << "Kill failed?"; |