Refs #2976. Linters.

ros2 · Jun 15, 2018 · ebaa19d · ebaa19d
1 parent f963d8f
commit ebaa19d
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 28 deletions.
diff --git a/rmw_fastrtps_cpp/include/rmw_fastrtps_cpp/TypeSupport.hpp b/rmw_fastrtps_cpp/include/rmw_fastrtps_cpp/TypeSupport.hpp
@@ -130,7 +130,10 @@ class TypeSupport : public eprosima::fastrtps::TopicDataType
 
   size_t calculateMaxSerializedSize(const MembersType * members, size_t current_alignment);
 
-  size_t getSerializedDataLength(const MembersType * members, const void * data, size_t current_alignment);
+  size_t getSerializedDataLength(
+    const MembersType * members,
+    const void * data,
+    size_t current_alignment);
 
   const MembersType * members_;
   bool max_size_bound_;

diff --git a/rmw_fastrtps_cpp/include/rmw_fastrtps_cpp/TypeSupport_impl.hpp b/rmw_fastrtps_cpp/include/rmw_fastrtps_cpp/TypeSupport_impl.hpp
@@ -229,14 +229,14 @@ size_t get_next_field_align(
   size_t item_size = sizeof(T);
   if (!member->is_array_) {
     return current_alignment + item_size +
-      eprosima::fastcdr::Cdr::alignment(current_alignment, item_size);
+           eprosima::fastcdr::Cdr::alignment(current_alignment, item_size);
   } else if (member->array_size_ && !member->is_upper_bound_) {
     return current_alignment + member->array_size_ * item_size +
-      eprosima::fastcdr::Cdr::alignment(current_alignment, item_size);
+           eprosima::fastcdr::Cdr::alignment(current_alignment, item_size);
   } else {
     std::vector<T> & data = *reinterpret_cast<std::vector<T> *>(field);
     return current_alignment + data.size() * item_size +
-      eprosima::fastcdr::Cdr::alignment(current_alignment, item_size);
+           eprosima::fastcdr::Cdr::alignment(current_alignment, item_size);
   }
 }
 
@@ -338,14 +338,14 @@ size_t get_next_field_align(
   size_t item_size = sizeof(T);
   if (!member->is_array_) {
     return current_alignment + item_size +
-      eprosima::fastcdr::Cdr::alignment(current_alignment, item_size);
+           eprosima::fastcdr::Cdr::alignment(current_alignment, item_size);
   } else if (member->array_size_ && !member->is_upper_bound_) {
     return current_alignment + member->array_size_ * item_size +
-      eprosima::fastcdr::Cdr::alignment(current_alignment, item_size);
+           eprosima::fastcdr::Cdr::alignment(current_alignment, item_size);
   } else {
     auto & data = *reinterpret_cast<typename GenericCArray<T>::type *>(field);
     return current_alignment + data.size * item_size +
-      eprosima::fastcdr::Cdr::alignment(current_alignment, item_size);
+           eprosima::fastcdr::Cdr::alignment(current_alignment, item_size);
   }
 }
 
@@ -824,8 +824,8 @@ size_t TypeSupport<MembersType>::calculateMaxSerializedSize(
 
 template<typename MembersType>
 size_t TypeSupport<MembersType>::getSerializedDataLength(
-  const MembersType * members, 
-  const void * ros_message, 
+  const MembersType * members,
+  const void * ros_message,
   size_t current_alignment)
 {
   assert(members);
@@ -894,7 +894,8 @@ size_t TypeSupport<MembersType>::getSerializedDataLength(
             }
 
             for (size_t index = 0; index < array_size; ++index) {
-              current_alignment += getSerializedDataLength(sub_members, subros_message, current_alignment);
+              current_alignment += getSerializedDataLength(sub_members, subros_message,
+                  current_alignment);
               subros_message = static_cast<char *>(subros_message) + sub_members_size;
               subros_message = align_(max_align, subros_message);
             }
@@ -964,12 +965,14 @@ bool TypeSupport<MembersType>::serialize(
   assert(data);
   assert(payload);
 
-  eprosima::fastcdr::FastBuffer fastbuffer((char*) payload->data, payload->max_size); // Object that manages the raw buffer.
+  eprosima::fastcdr::FastBuffer fastbuffer(
+    reinterpret_cast<char *>(payload->data),
+    payload->max_size);  // Object that manages the raw buffer.
   eprosima::fastcdr::Cdr ser(fastbuffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN,
-          eprosima::fastcdr::Cdr::DDS_CDR); // Object that serializes the data.
+    eprosima::fastcdr::Cdr::DDS_CDR);  // Object that serializes the data.
+  this->serializeROSmessage(data, ser);
   payload->encapsulation = ser.endianness() ==
     eprosima::fastcdr::Cdr::BIG_ENDIANNESS ? CDR_BE : CDR_LE;
-  this->serializeROSmessage(data, ser);
   payload->length = (uint32_t)ser.getSerializedDataLength();
   return true;
 }
@@ -980,25 +983,26 @@ bool TypeSupport<MembersType>::deserialize(
   void * data)
 {
   assert(data);
-  eprosima::fastcdr::FastBuffer fastbuffer((char*)payload->data, payload->length);
+  eprosima::fastcdr::FastBuffer fastbuffer(reinterpret_cast<char *>(payload->data),
+    payload->length);
   return this->deserializeROSmessage(&fastbuffer, data);
 }
 
 template<typename MembersType>
-std::function<uint32_t()> 
+std::function<uint32_t()>
 TypeSupport<MembersType>::getSerializedSizeProvider(void * data)
 {
   assert(data);
 
-  if(max_size_bound_) {
-    return [this]() -> uint32_t { return m_typeSize; };
+  if (max_size_bound_) {
+    return [this]() -> uint32_t {return m_typeSize;};
   }
 
   return [this, data]() -> uint32_t {
-    return 
-      4 + static_cast<uint32_t>(
-        TypeSupport::getSerializedDataLength(members_, data, 0));
-  };
+           return
+             4 + static_cast<uint32_t>(
+             TypeSupport::getSerializedDataLength(members_, data, 0));
+         };
 }
 
 }  // namespace rmw_fastrtps_cpp

diff --git a/rmw_fastrtps_cpp/include/rmw_fastrtps_cpp/custom_client_info.hpp b/rmw_fastrtps_cpp/include/rmw_fastrtps_cpp/custom_client_info.hpp
@@ -74,7 +74,7 @@ class ClientListener : public eprosima::fastrtps::SubscriberListener
     while (!ret_val && (subs->getUnreadCount() > 0) && (subs->takeNextData(data, &sinfo))) {
       if (eprosima::fastrtps::rtps::ALIVE == sinfo.sampleKind) {
         identity = sinfo.related_sample_identity;
-        ret_val =  (identity.writer_guid() == info_->writer_guid_);
+        ret_val = (identity.writer_guid() == info_->writer_guid_);
       }
     }
 

diff --git a/rmw_fastrtps_cpp/include/rmw_fastrtps_cpp/custom_service_info.hpp b/rmw_fastrtps_cpp/include/rmw_fastrtps_cpp/custom_service_info.hpp
@@ -78,7 +78,7 @@ class ServiceListener : public eprosima::fastrtps::SubscriberListener
       identity = sinfo.sample_identity;
       ret_val = (eprosima::fastrtps::rtps::ALIVE == sinfo.sampleKind);
     }
-	
+
     std::lock_guard<std::mutex> lock(internalMutex_);
     if (conditionMutex_ != nullptr) {
       std::unique_lock<std::mutex> clock(*conditionMutex_);

diff --git a/rmw_fastrtps_cpp/src/rmw_publish.cpp b/rmw_fastrtps_cpp/src/rmw_publish.cpp
@@ -39,7 +39,7 @@ rmw_publish(const rmw_publisher_t * publisher, const void * ros_message)
   auto info = static_cast<CustomPublisherInfo *>(publisher->data);
   assert(info);
 
-  if (info->publisher_->write((void *)ros_message)) {
+  if (info->publisher_->write(const_cast<void *>(ros_message))) {
     returnedValue = RMW_RET_OK;
   } else {
     RMW_SET_ERROR_MSG("cannot publish data");

diff --git a/rmw_fastrtps_cpp/src/rmw_request.cpp b/rmw_fastrtps_cpp/src/rmw_request.cpp
@@ -51,7 +51,7 @@ rmw_send_request(
 
   eprosima::fastrtps::rtps::WriteParams wparams;
 
-  if (info->request_publisher_->write((void *)ros_request, wparams)) {
+  if (info->request_publisher_->write(const_cast<void *>(ros_request), wparams)) {
     returnedValue = RMW_RET_OK;
     *sequence_id = ((int64_t)wparams.sample_identity().sequence_number().high) << 32 |
       wparams.sample_identity().sequence_number().low;
@@ -85,8 +85,8 @@ rmw_take_request(
   assert(info);
 
   eprosima::fastrtps::rtps::SampleIdentity identity;
-  
-  if(info->listener_->getRequest(ros_request, identity) ) {
+
+  if (info->listener_->getRequest(ros_request, identity) ) {
     // Get header
     memcpy(request_header->writer_guid, &identity.writer_guid(),
       sizeof(eprosima::fastrtps::rtps::GUID_t));

diff --git a/rmw_fastrtps_cpp/src/rmw_response.cpp b/rmw_fastrtps_cpp/src/rmw_response.cpp
@@ -50,7 +50,7 @@ rmw_take_response(
   assert(info);
 
   eprosima::fastrtps::rtps::SampleIdentity identity;
-  if(info->listener_->getResponse(ros_response, identity) ) {
+  if (info->listener_->getResponse(ros_response, identity) ) {
     request_header->sequence_number = ((int64_t)identity.sequence_number().high) <<
       32 | identity.sequence_number().low;