better use of nullptr
This commit is contained in:
parent
51fb16455d
commit
833b33b751
18
acn/pdu.cpp
18
acn/pdu.cpp
@ -36,10 +36,10 @@ namespace PDU {
|
|||||||
Pdu::Pdu(Stream stream, size_t vector_size)
|
Pdu::Pdu(Stream stream, size_t vector_size)
|
||||||
: flags_(stream->peek())
|
: flags_(stream->peek())
|
||||||
{
|
{
|
||||||
header_ = 0;
|
header_ = nullptr;
|
||||||
data_ = 0;
|
data_ = nullptr;
|
||||||
parent_ = 0;
|
parent_ = nullptr;
|
||||||
inherit_ = 0; // pointer to previous PDU in block
|
inherit_ = nullptr; // pointer to previous PDU in block
|
||||||
|
|
||||||
// read length and vector off of the stream
|
// read length and vector off of the stream
|
||||||
// abort if the remaining PDU length isn't available
|
// abort if the remaining PDU length isn't available
|
||||||
@ -99,7 +99,7 @@ const uint32_t Pdu::vector()
|
|||||||
{
|
{
|
||||||
if (flags_.hasVector)
|
if (flags_.hasVector)
|
||||||
return vector_;
|
return vector_;
|
||||||
if (inherit_ != nullptr)
|
if (inherit_)
|
||||||
return inherit_->vector();
|
return inherit_->vector();
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@ -113,9 +113,9 @@ pdu_header * Pdu::header()
|
|||||||
{
|
{
|
||||||
if (flags_.hasHeader)
|
if (flags_.hasHeader)
|
||||||
return header_;
|
return header_;
|
||||||
if (inherit_ != nullptr)
|
if (inherit_)
|
||||||
return inherit_->header();
|
return inherit_->header();
|
||||||
return 0;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -127,9 +127,9 @@ pdu_data * Pdu::data()
|
|||||||
{
|
{
|
||||||
if (flags_.hasData)
|
if (flags_.hasData)
|
||||||
return data_;
|
return data_;
|
||||||
if (inherit_ != nullptr)
|
if (inherit_)
|
||||||
return inherit_->data();
|
return inherit_->data();
|
||||||
return 0;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user