summaryrefslogtreecommitdiff
path: root/core/fxcrt
diff options
context:
space:
mode:
authorthestig <thestig@chromium.org>2016-06-07 17:53:06 -0700
committerCommit bot <commit-bot@chromium.org>2016-06-07 17:53:06 -0700
commit1cd352e0a4bc19f96df199b0acfa32a344240d5e (patch)
treebe24d7a4bd135c2ab5568148ab318b7bf648edda /core/fxcrt
parenta4fdfc5ed0e8d2e6acc52cc34eac42c6072f0ccc (diff)
downloadpdfium-1cd352e0a4bc19f96df199b0acfa32a344240d5e.tar.xz
Get rid of NULLs in fpdfsdk/
Review-Url: https://codereview.chromium.org/2031653003
Diffstat (limited to 'core/fxcrt')
-rw-r--r--core/fxcrt/fx_basic_bstring_unittest.cpp2
-rw-r--r--core/fxcrt/include/fx_memory.h6
2 files changed, 4 insertions, 4 deletions
diff --git a/core/fxcrt/fx_basic_bstring_unittest.cpp b/core/fxcrt/fx_basic_bstring_unittest.cpp
index 220105aa95..cfdf2794b4 100644
--- a/core/fxcrt/fx_basic_bstring_unittest.cpp
+++ b/core/fxcrt/fx_basic_bstring_unittest.cpp
@@ -758,7 +758,7 @@ TEST(fxcrt, ByteStringCFromChar) {
CFX_ByteStringC nul_string_from_char(nul);
CFX_ByteStringC lower_a_string_from_char(lower_a);
- // Pointer to nul, not NULL ptr, hence length 1 ...
+ // Pointer to nul, not nullptr ptr, hence length 1 ...
EXPECT_EQ(1, nul_string_from_char.GetLength());
EXPECT_NE(null_string, nul_string_from_char);
diff --git a/core/fxcrt/include/fx_memory.h b/core/fxcrt/include/fx_memory.h
index 3048897d76..fa8da6067c 100644
--- a/core/fxcrt/include/fx_memory.h
+++ b/core/fxcrt/include/fx_memory.h
@@ -13,7 +13,7 @@
extern "C" {
#endif
-// For external C libraries to malloc through PDFium. These may return NULL.
+// For external C libraries to malloc through PDFium. These may return nullptr.
void* FXMEM_DefaultAlloc(size_t byte_size, int flags);
void* FXMEM_DefaultRealloc(void* pointer, size_t new_size, int flags);
void FXMEM_DefaultFree(void* pointer, int flags);
@@ -61,13 +61,13 @@ inline void* FX_ReallocOrDie(void* ptr,
return nullptr; // Suppress compiler warning.
}
-// Never returns NULL.
+// Never returns nullptr.
#define FX_Alloc(type, size) (type*) FX_AllocOrDie(size, sizeof(type))
#define FX_Alloc2D(type, w, h) (type*) FX_AllocOrDie2D(w, h, sizeof(type))
#define FX_Realloc(type, ptr, size) \
(type*) FX_ReallocOrDie(ptr, size, sizeof(type))
-// May return NULL.
+// May return nullptr.
#define FX_TryAlloc(type, size) (type*) calloc(size, sizeof(type))
#define FX_TryRealloc(type, ptr, size) \
(type*) FX_SafeRealloc(ptr, size, sizeof(type))