summaryrefslogtreecommitdiff
path: root/core/include
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2015-12-14 18:29:28 -0800
committerLei Zhang <thestig@chromium.org>2015-12-14 18:29:28 -0800
commite385244f8cd6ae376f6b3cf1265a0795d5d30eff (patch)
tree4bdd7c459f167ee56ae35f3b87222c2557f501f8 /core/include
parente3c7c2b54348da4a6939f6672f6c6bff126815a7 (diff)
downloadpdfium-e385244f8cd6ae376f6b3cf1265a0795d5d30eff.tar.xz
Get rid of most instance of 'foo == NULL'
R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1520063002 .
Diffstat (limited to 'core/include')
-rw-r--r--core/include/fpdfapi/fpdf_resource.h2
-rw-r--r--core/include/fxcrt/fx_basic.h10
2 files changed, 6 insertions, 6 deletions
diff --git a/core/include/fpdfapi/fpdf_resource.h b/core/include/fpdfapi/fpdf_resource.h
index 1f6c8b005b..d6d43ee9a7 100644
--- a/core/include/fpdfapi/fpdf_resource.h
+++ b/core/include/fpdfapi/fpdf_resource.h
@@ -605,7 +605,7 @@ class CPDF_Color {
~CPDF_Color();
- FX_BOOL IsNull() const { return m_pBuffer == NULL; }
+ FX_BOOL IsNull() const { return !m_pBuffer; }
FX_BOOL IsEqual(const CPDF_Color& other) const;
diff --git a/core/include/fxcrt/fx_basic.h b/core/include/fxcrt/fx_basic.h
index b712d7b5ed..6e7fbb4555 100644
--- a/core/include/fxcrt/fx_basic.h
+++ b/core/include/fxcrt/fx_basic.h
@@ -884,7 +884,7 @@ class CFX_CountRef {
void operator=(void* p) {
FXSYS_assert(p == 0);
- if (m_pObject == NULL) {
+ if (!m_pObject) {
return;
}
m_pObject->m_RefCount--;
@@ -898,12 +898,12 @@ class CFX_CountRef {
operator const ObjClass*() const { return m_pObject; }
- FX_BOOL IsNull() const { return m_pObject == NULL; }
+ FX_BOOL IsNull() const { return !m_pObject; }
- FX_BOOL NotNull() const { return m_pObject != NULL; }
+ FX_BOOL NotNull() const { return !IsNull(); }
ObjClass* GetModify() {
- if (m_pObject == NULL) {
+ if (!m_pObject) {
m_pObject = new CountedObj;
m_pObject->m_RefCount = 1;
} else if (m_pObject->m_RefCount > 1) {
@@ -916,7 +916,7 @@ class CFX_CountRef {
}
void SetNull() {
- if (m_pObject == NULL) {
+ if (!m_pObject) {
return;
}
m_pObject->m_RefCount--;