nils/ebusd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use nullptr instead of NULL

Browse Source
This commit is contained in:
john30
2018-05-06 14:54:52 +02:00
parent dc12476bc1
commit 1c17f7c466
41 changed files with 625 additions and 626 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/ebus/test/test_data.cpp
+14 -14
View File
@@ -52,7 +52,7 @@ class TestReader : public MappedFileReader {
public:
TestReader(DataFieldTemplates* templates, bool isSet, bool isMasterDest)
: MappedFileReader::MappedFileReader(true), m_templates(templates), m_isSet(isSet), m_isMasterDest(isMasterDest),
m_fields(NULL) {}
m_fields(nullptr) {}
result_t getFieldMap(const string& preferLanguage, vector<string>* row, string* errorDescription) const override {
if (row->empty()) {
row->push_back("*name");
@@ -512,8 +512,8 @@ int main() {
istringstream dummystr("#");
string errorDescription;
vector<string> row;
templates->readLineFromStream(&dummystr, __FILE__, false, &lineNo, &row, &errorDescription, false, NULL, NULL);
const DataField* fields = NULL;
templates->readLineFromStream(&dummystr, __FILE__, false, &lineNo, &row, &errorDescription, false, nullptr, nullptr);
const DataField* fields = nullptr;
for (unsigned int i = 0; i < sizeof(checks) / sizeof(checks[0]); i++) {
string check[5] = checks[i];
istringstream isstr(check[0]);
@@ -539,7 +539,7 @@ int main() {
bool failedReadMatch = flags.find('R') != string::npos;
bool failedWrite = flags.find('w') != string::npos;
bool failedWriteMatch = flags.find('W') != string::npos;
const char* findName = flags.find('I') == string::npos ? NULL : "x";
const char* findName = flags.find('I') == string::npos ? nullptr : "x";
ssize_t findIndex = -1;
if (flags.find('i') != string::npos) {
findIndex = parseSignedInt(flags.substr(flags.find('i')+1).c_str(), 10, 0, 9, &result);
@@ -561,13 +561,13 @@ int main() {
bool isTemplate = flags.find('t') != string::npos;
string item;
if (fields != NULL) {
if (fields != nullptr) {
delete fields;
fields = NULL;
fields = nullptr;
}
if (isTemplate) {
lineNo = baseLine + i;
result = templates->readLineFromStream(&isstr, __FILE__, false, &lineNo, &row, &errorDescription, false, NULL, NULL);
result = templates->readLineFromStream(&isstr, __FILE__, false, &lineNo, &row, &errorDescription, false, nullptr, nullptr);
if (result != RESULT_OK) {
cout << "\"" << check[0] << "\": template read error: " << getResultCode(result) << ", "
<< errorDescription << endl;
@@ -579,7 +579,7 @@ int main() {
lineNo = 0;
dummystr.clear();
dummystr.str("#");
result = reader.readLineFromStream(&dummystr, __FILE__, false, &lineNo, &row, &errorDescription, false, NULL, NULL);
result = reader.readLineFromStream(&dummystr, __FILE__, false, &lineNo, &row, &errorDescription, false, nullptr, nullptr);
if (result != RESULT_OK) {
cout << "\"" << check[0] << "\": read header error: " << getResultCode(result) << ", " << errorDescription
<< endl;
@@ -587,7 +587,7 @@ int main() {
continue;
}
lineNo = baseLine + i;
result = reader.readLineFromStream(&isstr, "", false, &lineNo, &row, &errorDescription, false, NULL, NULL);
result = reader.readLineFromStream(&isstr, "", false, &lineNo, &row, &errorDescription, false, nullptr, nullptr);
fields = reader.m_fields;
if (failedCreate) {
if (result == RESULT_OK) {
@@ -603,8 +603,8 @@ int main() {
error = true;
continue;
}
if (fields == NULL) {
cout << "\"" << check[0] << "\": create error: NULL" << endl;
if (fields == nullptr) {
cout << "\"" << check[0] << "\": create error: nullptr" << endl;
error = true;
continue;
}
@@ -649,9 +649,9 @@ int main() {
if (verbosity == 0) {
istringstream input(expectStr);
result = fields->write(UI_FIELD_SEPARATOR, 0, &input, &writeMstr, NULL);
result = fields->write(UI_FIELD_SEPARATOR, 0, &input, &writeMstr, nullptr);
if (result >= RESULT_OK) {
result = fields->write(UI_FIELD_SEPARATOR, 0, &input, &writeSstr, NULL);
result = fields->write(UI_FIELD_SEPARATOR, 0, &input, &writeSstr, nullptr);
}
if (failedWrite) {
if (result >= RESULT_OK) {
@@ -673,7 +673,7 @@ int main() {
}
}
delete fields;
fields = NULL;
fields = nullptr;
}
delete templates;
src/lib/ebus/test/test_device.cpp
+1 -1
View File
@@ -25,7 +25,7 @@ using namespace ebusd;
int main() {
Device* device = Device::create("/dev/ttyUSB20", true, false, false);
if (device == NULL) {
if (device == nullptr) {
cout << "unable to create device" << endl;
return -1;
}
src/lib/ebus/test/test_filereader.cpp
+1 -1
View File
@@ -201,7 +201,7 @@ int main(int argc, char** argv) {
if (!stream) {
result = RESULT_ERR_NOTFOUND;
} else {
result = reader.readFromStream(stream, argv[argpos], time, false, NULL, &errorDescription, false, &hash, &size);
result = reader.readFromStream(stream, argv[argpos], time, false, nullptr, &errorDescription, false, &hash, &size);
}
cout << argv[argpos] << " ";
if (result != RESULT_OK) {
src/lib/ebus/test/test_message.cpp
+18 -18
View File
@@ -50,7 +50,7 @@ void verify(bool expectFailMatch, string type, string input,
}
}
DataFieldTemplates* templates = NULL;
DataFieldTemplates* templates = nullptr;
namespace ebusd {
@@ -186,14 +186,14 @@ int main() {
istringstream dummystr("#");
string errorDescription;
vector<string> row;
templates->readLineFromStream(&dummystr, __FILE__, false, &lineNo, &row, &errorDescription, false, NULL, NULL);
templates->readLineFromStream(&dummystr, __FILE__, false, &lineNo, &row, &errorDescription, false, nullptr, nullptr);
lineNo = 0;
MessageMap* messages = new MessageMap("");
dummystr.clear();
dummystr.str("#");
messages->readLineFromStream(&dummystr, __FILE__, false, &lineNo, &row, &errorDescription, false, NULL, NULL);
messages->readLineFromStream(&dummystr, __FILE__, false, &lineNo, &row, &errorDescription, false, nullptr, nullptr);
vector< vector<string> > defaultsRows;
Message* message = NULL;
Message* message = nullptr;
vector<MasterSymbolString*> mstrs;
vector<SlaveSymbolString*> sstrs;
mstrs.resize(1);
@@ -222,7 +222,7 @@ int main() {
lineNo = baseLine + i;
cout << "line " << (lineNo+1) << " ";
if (isTemplate) {
result = templates->readLineFromStream(&isstr, __FILE__, false, &lineNo, &row, &errorDescription, false, NULL, NULL);
result = templates->readLineFromStream(&isstr, __FILE__, false, &lineNo, &row, &errorDescription, false, nullptr, nullptr);
if (result != RESULT_OK) {
cout << "\"" << check[0] << "\": template read error: " << getResultCode(result) << ", " << errorDescription
<< endl;
@@ -236,7 +236,7 @@ int main() {
}
if (isstr.peek() == '*') {
// store defaults or condition
result = messages->readLineFromStream(&isstr, __FILE__, false, &lineNo, &row, &errorDescription, false, NULL, NULL);
result = messages->readLineFromStream(&isstr, __FILE__, false, &lineNo, &row, &errorDescription, false, nullptr, nullptr);
if (result != RESULT_OK) {
cout << "\"" << check[0] << "\": default read error: " << getResultCode(result) << ", " << errorDescription << endl;
error = true;
@@ -252,7 +252,7 @@ int main() {
while (getline(stream, token, VALUE_SEPARATOR)) {
if (pos >= mstrs.size()) {
mstrs.resize(pos+1);
} else if (mstrs[pos] != NULL) {
} else if (mstrs[pos] != nullptr) {
delete mstrs[pos];
}
mstrs[pos] = new MasterSymbolString();
@@ -270,7 +270,7 @@ int main() {
while (getline(stream, token, VALUE_SEPARATOR)) {
if (pos >= sstrs.size()) {
sstrs.resize(pos+1);
} else if (sstrs[pos] != NULL) {
} else if (sstrs[pos] != nullptr) {
delete sstrs[pos];
}
sstrs[pos] = new SlaveSymbolString();
@@ -287,7 +287,7 @@ int main() {
continue;
}
} else {
if (mstrs[0] != NULL) {
if (mstrs[0] != nullptr) {
delete mstrs[0];
}
mstrs[0] = new MasterSymbolString();
@@ -297,7 +297,7 @@ int main() {
error = true;
continue;
}
if (sstrs[0] != NULL) {
if (sstrs[0] != nullptr) {
delete sstrs[0];
}
sstrs[0] = new SlaveSymbolString();
@@ -311,14 +311,14 @@ int main() {
if (isstr.peek() == EOF) {
message = messages->find(*mstrs[0]);
if (message == NULL) {
cout << "\"" << check[2] << "\": find error: NULL" << endl;
if (message == nullptr) {
cout << "\"" << check[2] << "\": find error: nullptr" << endl;
error = true;
continue;
}
cout << "\"" << check[2] << "\": find OK" << endl;
} else {
result = messages->readLineFromStream(&isstr, __FILE__, false, &lineNo, &row, &errorDescription, false, NULL, NULL);
result = messages->readLineFromStream(&isstr, __FILE__, false, &lineNo, &row, &errorDescription, false, nullptr, nullptr);
if (failedCreate) {
if (result == RESULT_OK) {
cout << "\"" << check[0] << "\": failed create error: unexpectedly succeeded" << endl;
@@ -334,7 +334,7 @@ int main() {
continue;
}
if (messages->size() == 0) {
cout << "\"" << check[0] << "\": create error: NULL" << endl;
cout << "\"" << check[0] << "\": create error: nullptr" << endl;
error = true;
continue;
}
@@ -355,7 +355,7 @@ int main() {
deque<Message*> msgs;
messages->findAll("", "", "*", false, true, true, true, true, false, 0, 0, &msgs);
if (msgs.empty()) {
message = NULL;
message = nullptr;
cout << "\"" << check[0] << "\": create error: message not found" << endl;
error = true;
continue;
@@ -364,7 +364,7 @@ int main() {
Message* foundMessage = messages->find(*mstrs[0], false, true, true, true, false);
if (foundMessage == message) {
cout << " find OK" << endl;
} else if (foundMessage == NULL) {
} else if (foundMessage == nullptr) {
cout << " find error: message not found by master " << mstrs[0]->getStr() << endl;
error = true;
continue;
@@ -399,11 +399,11 @@ int main() {
output.str("");
output << str;
} else {
message->dump(NULL, true, &output);
message->dump(nullptr, true, &output);
}
output << ": ";
}
result = message->decodeLastData(false, NULL, -1,
result = message->decodeLastData(false, nullptr, -1,
(decodeVerbose?OF_NAMES|OF_UNITS|OF_COMMENTS:0)|(decodeJson?OF_NAMES|OF_JSON:0), &output);
if (result != RESULT_OK) {
cout << " \"" << check[2] << "\" / \"" << check[3] << "\": decode error: "