DTSC packet re-init verbosity tweak

This commit is contained in:
Thulinma 2016-07-06 16:05:13 +02:00
parent 1bf574acb8
commit 9e9550f2b7

View file

@ -22,7 +22,11 @@ namespace DTSC {
master = false; master = false;
bufferLen = 0; bufferLen = 0;
data = NULL; data = NULL;
if (rhs.data && rhs.dataLen){
reInit(rhs.data, rhs.dataLen, !rhs.master); reInit(rhs.data, rhs.dataLen, !rhs.master);
}else{
null();
}
} }
/// Data constructor for packets, either references or copies a packet from raw data. /// Data constructor for packets, either references or copies a packet from raw data.
@ -46,7 +50,7 @@ namespace DTSC {
if (master && !rhs.master) { if (master && !rhs.master) {
null(); null();
} }
if (rhs) { if (rhs && rhs.data && rhs.dataLen) {
reInit(rhs.data, rhs.dataLen, !rhs.master); reInit(rhs.data, rhs.dataLen, !rhs.master);
} else { } else {
null(); null();
@ -141,7 +145,7 @@ namespace DTSC {
///\param noCopy Determines whether to make a copy or not ///\param noCopy Determines whether to make a copy or not
void Packet::reInit(const char * data_, unsigned int len, bool noCopy) { void Packet::reInit(const char * data_, unsigned int len, bool noCopy) {
if (!data_) { if (!data_) {
HIGH_MSG("ReInit received a null pointer with len %d, ignoring", len); WARN_MSG("ReInit received a null pointer with len %d, nulling", len);
null(); null();
return; return;
} }