diff options
author | Yi Kong <yikong@google.com> | 2018-08-06 14:48:58 -0700 |
---|---|---|
committer | Yi Kong <yikong@google.com> | 2018-08-08 14:08:35 -0700 |
commit | 288f355e1a0f729eae21c0a01f5c55bb22d1d0a7 (patch) | |
tree | 7f5822688547eb7982436dd9877bda22c2b80fe2 | |
parent | 46331602ae6360faa872b9dec7dc43a6e48151b0 (diff) |
Modernize codebase by replacing NULL with nullptr
Fixes -Wzero-as-null-pointer-constant warning.
Test: m
Bug: 68236239
Change-Id: Ic440b9fcb9be97c316448b764f7110ef1f7eb525
Merged-In: Ic440b9fcb9be97c316448b764f7110ef1f7eb525
(cherry picked from commit 08a8d728dbe379cd70974ba98d59017f5506e0e5)
-rw-r--r-- | cmds/incident_helper/src/ih_util.cpp | 10 | ||||
-rw-r--r-- | cmds/incident_helper/src/main.cpp | 2 | ||||
-rw-r--r-- | cmds/incident_helper/src/parsers/CpuInfoParser.cpp | 2 | ||||
-rw-r--r-- | cmds/incident_helper/src/parsers/PsParser.cpp | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/cmds/incident_helper/src/ih_util.cpp b/cmds/incident_helper/src/ih_util.cpp index 4c4d1b992ba8..012310cc277a 100644 --- a/cmds/incident_helper/src/ih_util.cpp +++ b/cmds/incident_helper/src/ih_util.cpp @@ -97,7 +97,7 @@ bool getColumnIndices(std::vector<int>& indices, const char** headerNames, const size_t lastIndex = 0; int i = 0; - while (headerNames[i] != NULL) { + while (headerNames[i] != nullptr) { std::string s = headerNames[i]; lastIndex = line.find(s, lastIndex); if (lastIndex == std::string::npos) { @@ -237,18 +237,18 @@ double toDouble(const std::string& s) { Reader::Reader(const int fd) { mFile = fdopen(fd, "r"); - mStatus = mFile == NULL ? "Invalid fd " + std::to_string(fd) : ""; + mStatus = mFile == nullptr ? "Invalid fd " + std::to_string(fd) : ""; } Reader::~Reader() { - if (mFile != NULL) fclose(mFile); + if (mFile != nullptr) fclose(mFile); } bool Reader::readLine(std::string* line) { - if (mFile == NULL) return false; + if (mFile == nullptr) return false; - char* buf = NULL; + char* buf = nullptr; size_t len = 0; ssize_t read = getline(&buf, &len, mFile); if (read != -1) { diff --git a/cmds/incident_helper/src/main.cpp b/cmds/incident_helper/src/main.cpp index 418dc3fad761..091410bce2dd 100644 --- a/cmds/incident_helper/src/main.cpp +++ b/cmds/incident_helper/src/main.cpp @@ -97,7 +97,7 @@ int main(int argc, char** argv) { fprintf(stderr, "Pasring section %d...\n", sectionID); TextParserBase* parser = selectParser(sectionID); - if (parser != NULL) { + if (parser != nullptr) { fprintf(stderr, "Running parser: %s\n", parser->name.string()); status_t err = parser->Parse(STDIN_FILENO, STDOUT_FILENO); if (err != NO_ERROR) { diff --git a/cmds/incident_helper/src/parsers/CpuInfoParser.cpp b/cmds/incident_helper/src/parsers/CpuInfoParser.cpp index eed68b9e29c6..21ced9cb485c 100644 --- a/cmds/incident_helper/src/parsers/CpuInfoParser.cpp +++ b/cmds/incident_helper/src/parsers/CpuInfoParser.cpp @@ -109,7 +109,7 @@ CpuInfoParser::Parse(const int in, const int out) const nextToUsage = false; // NAME is not in the list since we need to modify the end of the CMD index. - const char* headerNames[] = { "PID", "TID", "USER", "PR", "NI", "CPU", "S", "VIRT", "RES", "PCY", "CMD", NULL }; + const char* headerNames[] = { "PID", "TID", "USER", "PR", "NI", "CPU", "S", "VIRT", "RES", "PCY", "CMD", nullptr }; if (!getColumnIndices(columnIndices, headerNames, line)) { return -1; } diff --git a/cmds/incident_helper/src/parsers/PsParser.cpp b/cmds/incident_helper/src/parsers/PsParser.cpp index 8d64064e26f4..d3cb4be59f66 100644 --- a/cmds/incident_helper/src/parsers/PsParser.cpp +++ b/cmds/incident_helper/src/parsers/PsParser.cpp @@ -48,7 +48,7 @@ status_t PsParser::Parse(const int in, const int out) const { if (nline++ == 0) { header = parseHeader(line, DEFAULT_WHITESPACE); - const char* headerNames[] = { "LABEL", "USER", "PID", "TID", "PPID", "VSZ", "RSS", "WCHAN", "ADDR", "S", "PRI", "NI", "RTPRIO", "SCH", "PCY", "TIME", "CMD", NULL }; + const char* headerNames[] = { "LABEL", "USER", "PID", "TID", "PPID", "VSZ", "RSS", "WCHAN", "ADDR", "S", "PRI", "NI", "RTPRIO", "SCH", "PCY", "TIME", "CMD", nullptr }; if (!getColumnIndices(columnIndices, headerNames, line)) { return -1; } |