diff options
| author | Yi Kong <yikong@google.com> | 2018-07-17 10:06:10 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-07-17 10:06:10 -0700 |
| commit | 2a6a58a818d5cc38cb624a6a4154a93166d01f18 (patch) | |
| tree | a7a612b80717c9ed88e880fc9f160fa9b1b3ae25 /libutils/Printer.cpp | |
| parent | 6286088afee20c7c4cfe125cbddd3a13adc5fd15 (diff) | |
| parent | ab3203f38363e7b5fadfe281ed8870be6044b674 (diff) | |
| download | system_core-2a6a58a818d5cc38cb624a6a4154a93166d01f18.tar.gz system_core-2a6a58a818d5cc38cb624a6a4154a93166d01f18.tar.bz2 system_core-2a6a58a818d5cc38cb624a6a4154a93166d01f18.zip | |
Merge "[libutils] Modernize codebase by replacing NULL with nullptr"
am: ab3203f383
Change-Id: I5c2aaaea705a3ab82a5ad999f813e4cc22e63401
Diffstat (limited to 'libutils/Printer.cpp')
| -rw-r--r-- | libutils/Printer.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libutils/Printer.cpp b/libutils/Printer.cpp index cbf042eb5..c9ae210ba 100644 --- a/libutils/Printer.cpp +++ b/libutils/Printer.cpp @@ -73,7 +73,7 @@ LogPrinter::LogPrinter(const char* logtag, } void LogPrinter::printLine(const char* string) { - if (string == NULL) { + if (string == nullptr) { ALOGW("%s: NULL string passed in", __FUNCTION__); return; } @@ -107,7 +107,7 @@ FdPrinter::FdPrinter(int fd, unsigned int indent, const char* prefix) : } void FdPrinter::printLine(const char* string) { - if (string == NULL) { + if (string == nullptr) { ALOGW("%s: NULL string passed in", __FUNCTION__); return; } else if (mFd < 0) { @@ -127,16 +127,16 @@ String8Printer::String8Printer(String8* target, const char* prefix) : mTarget(target), mPrefix(prefix ?: "") { - if (target == NULL) { + if (target == nullptr) { ALOGW("%s: Target string was NULL", __FUNCTION__); } } void String8Printer::printLine(const char* string) { - if (string == NULL) { + if (string == nullptr) { ALOGW("%s: NULL string passed in", __FUNCTION__); return; - } else if (mTarget == NULL) { + } else if (mTarget == nullptr) { ALOGW("%s: Target string was NULL", __FUNCTION__); return; } |