Replace NULL with nullptr or null in webrtc/audio/ and common_audio/.
BUG=webrtc:7147
Review-Url: https://codereview.webrtc.org/2719733002
Cr-Original-Commit-Position: refs/heads/master@{#16843}
Cr-Mirrored-From: https://chromium.googlesource.com/external/webrtc
Cr-Mirrored-Commit: 922246a353acff8445d4b104f0271befff2bfa68
diff --git a/common_audio/vad/include/webrtc_vad.h b/common_audio/vad/include/webrtc_vad.h
index 91308ee..7c11b12 100644
--- a/common_audio/vad/include/webrtc_vad.h
+++ b/common_audio/vad/include/webrtc_vad.h
@@ -39,7 +39,7 @@
// - handle [i/o] : Instance that should be initialized.
//
// returns : 0 - (OK),
-// -1 - (NULL pointer or Default mode could not be set).
+// -1 - (null pointer or Default mode could not be set).
int WebRtcVad_Init(VadInst* handle);
// Sets the VAD operating mode. A more aggressive (higher mode) VAD is more
@@ -51,7 +51,7 @@
// - mode [i] : Aggressiveness mode (0, 1, 2, or 3).
//
// returns : 0 - (OK),
-// -1 - (NULL pointer, mode could not be set or the VAD instance
+// -1 - (null pointer, mode could not be set or the VAD instance
// has not been initialized).
int WebRtcVad_set_mode(VadInst* handle, int mode);
diff --git a/common_audio/vad/vad_core.h b/common_audio/vad/vad_core.h
index b38c515..0a76d96 100644
--- a/common_audio/vad/vad_core.h
+++ b/common_audio/vad/vad_core.h
@@ -60,7 +60,7 @@
//
// - self [i/o] : Instance that should be initialized
//
-// returns : 0 (OK), -1 (NULL pointer in or if the default mode can't be
+// returns : 0 (OK), -1 (null pointer in or if the default mode can't be
// set)
int WebRtcVad_InitCore(VadInstT* self);
diff --git a/common_audio/vad/vad_core_unittest.cc b/common_audio/vad/vad_core_unittest.cc
index 43673ee..ba53c56 100644
--- a/common_audio/vad/vad_core_unittest.cc
+++ b/common_audio/vad/vad_core_unittest.cc
@@ -24,10 +24,10 @@
// Test WebRtcVad_InitCore().
VadInstT* self = reinterpret_cast<VadInstT*>(malloc(sizeof(VadInstT)));
- // NULL pointer test.
- EXPECT_EQ(-1, WebRtcVad_InitCore(NULL));
+ // null pointer test.
+ EXPECT_EQ(-1, WebRtcVad_InitCore(nullptr));
- // Verify return = 0 for non-NULL pointer.
+ // Verify return = 0 for non-null pointer.
EXPECT_EQ(0, WebRtcVad_InitCore(self));
// Verify init_flag is set.
EXPECT_EQ(42, self->init_flag);
@@ -38,7 +38,7 @@
TEST_F(VadTest, set_mode_core) {
VadInstT* self = reinterpret_cast<VadInstT*>(malloc(sizeof(VadInstT)));
- // TODO(bjornv): Add NULL pointer check if we take care of it in
+ // TODO(bjornv): Add null pointer check if we take care of it in
// vad_core.c
ASSERT_EQ(0, WebRtcVad_InitCore(self));
@@ -58,7 +58,7 @@
VadInstT* self = reinterpret_cast<VadInstT*>(malloc(sizeof(VadInstT)));
int16_t speech[kMaxFrameLength];
- // TODO(bjornv): Add NULL pointer check if we take care of it in
+ // TODO(bjornv): Add null pointer check if we take care of it in
// vad_core.c
// Test WebRtcVad_CalcVadXXkhz()
