X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=low-can-binding%2Fcan%2Fmessage%2Fcan-message.cpp;h=a8843b9f36ab038f3c9cac761fa329815a407dfc;hb=refs%2Fchanges%2F60%2F23260%2F6;hp=1f73c27e0df2ad251b03fc6134f517849ed020de;hpb=368c69724971ec73ac47bd1072204cddcc888355;p=apps%2Fagl-service-can-low-level.git

diff --git a/low-can-binding/can/message/can-message.cpp b/low-can-binding/can/message/can-message.cpp
index 1f73c27e..a8843b9f 100644
--- a/low-can-binding/can/message/can-message.cpp
+++ b/low-can-binding/can/message/can-message.cpp
@@ -131,9 +131,7 @@ std::shared_ptr<can_message_t> can_message_t::convert_from_frame(const struct ca
 			if(rtr_flag)
 				length = frame.len& 0xF;
 			else
-			{
 				length = (frame.len > maxdlen) ? maxdlen : frame.len;
-			}
 		}
 	}
 	else
@@ -178,7 +176,9 @@ struct canfd_frame can_message_t::convert_to_canfd_frame()
 		::memcpy(frame.data, get_data(), length_);
 	}
 	else
+	{
 		AFB_ERROR("can_message_t not correctly initialized to be sent");
+	}
 
 	return frame;
 }
@@ -204,12 +204,12 @@ struct std::vector<canfd_frame> can_message_t::convert_to_canfd_frame_vector()
 				std::vector<uint8_t> data = get_data_vector((i*64),(i*64)+63);
 				if(data.size()<64)
 				{
-					::memset(frame.data,0,sizeof(frame.data));
-					::memcpy(frame.data,data.data(),data.size());
+					::memset(frame.data, 0, sizeof(frame.data));
+					::memcpy(frame.data, data.data(), data.size());
 				}
 				else
 				{
-					::memcpy(frame.data,data.data(),64);
+					::memcpy(frame.data, data.data(), 64);
 				}
 				ret.push_back(frame);
 				i++;
@@ -226,13 +226,13 @@ struct std::vector<canfd_frame> can_message_t::convert_to_canfd_frame_vector()
 				std::vector<uint8_t> data = get_data_vector(i*8,(i*8)+7);
 				if(data.size()<8)
 				{
-					::memset(frame.data,0,sizeof(frame.data));
-					::memcpy(frame.data,data.data(),data.size());
+					::memset(frame.data, 0, sizeof(frame.data));
+					::memcpy(frame.data, data.data(), data.size());
 				}
 				else
 				{
-					::memset(frame.data,0,sizeof(frame.data));
-					::memcpy(frame.data,data.data(),8);
+					::memset(frame.data, 0, sizeof(frame.data));
+					::memcpy(frame.data, data.data(), 8);
 				}
 				ret.push_back(frame);
 				i++;
@@ -261,7 +261,9 @@ struct can_frame can_message_t::convert_to_can_frame()
 		::memcpy(frame.data, get_data(), length_);
 	}
 	else
+	{
 		AFB_ERROR("can_message_t not correctly initialized to be sent");
+	}
 
 	return frame;
 }
@@ -276,9 +278,7 @@ std::string can_message_t::get_debug_message()
 	std::string ret = "";
 	ret = ret + "Here is the next can message : id " + std::to_string(id_)  + " length " + std::to_string(length_) + ", data ";
 	for (size_t i = 0; i < data_.size(); i++)
-	{
 		ret = ret + std::to_string(data_[i]);
-	}
 
 	return ret;
 }