Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Modernize codebase by replacing NULL with nullptr"

Browse Source
This commit is contained in:
Yi Kong
2018-08-07 07:04:08 +00:00
committed by Android (Google) Code Review
parent 442deb0156 08a8d728db
commit 3caa540453
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cmds/incident_helper/src/ih_util.cpp
View File

@@ -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) {

2
cmds/incident_helper/src/main.cpp
View File

@@ -98,7 +98,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) {

2
cmds/incident_helper/src/parsers/CpuInfoParser.cpp
View File

@@ -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;
}

2
cmds/incident_helper/src/parsers/PsParser.cpp
View File

@@ -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;
}