Control flow/braces fixes

This commit is contained in:
Pavel Kirienko
2014-04-18 19:55:51 +04:00
parent 1853f5c73c
commit fd71f55933
7 changed files with 35 additions and 4 deletions
+6 -4
View File
@@ -26,9 +26,11 @@ int Frame::getMaxPayloadLen() const
return sizeof(payload_) - 1;
}
default:
{
assert(0);
return -ErrLogic;
}
}
}
int Frame::setPayload(const uint8_t* data, unsigned len)
@@ -86,7 +88,6 @@ bool Frame::parse(const CanFrame& can_frame)
std::copy(can_frame.data, can_frame.data + can_frame.dlc, payload_);
break;
}
case TransferTypeServiceResponse:
case TransferTypeServiceRequest:
case TransferTypeMessageUnicast:
@@ -104,10 +105,11 @@ bool Frame::parse(const CanFrame& can_frame)
std::copy(can_frame.data + 1, can_frame.data + can_frame.dlc, payload_);
break;
}
default:
{
return false;
}
}
return isValid();
}
@@ -143,7 +145,6 @@ bool Frame::compile(CanFrame& out_can_frame) const
std::copy(payload_, payload_ + payload_len_, out_can_frame.data);
break;
}
case TransferTypeServiceResponse:
case TransferTypeServiceRequest:
case TransferTypeMessageUnicast:
@@ -154,11 +155,12 @@ bool Frame::compile(CanFrame& out_can_frame) const
std::copy(payload_, payload_ + payload_len_, out_can_frame.data + 1);
break;
}
default:
{
assert(0);
return false;
}
}
return true;
}