Skip to content

Commit

Permalink
linters
Browse files Browse the repository at this point in the history
  • Loading branch information
Karsten1987 committed Feb 28, 2018
1 parent c588b09 commit 4544fc6
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
5 changes: 2 additions & 3 deletions rmw_fastrtps_cpp/src/rmw_publish.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ rmw_publish_raw(const rmw_publisher_t * publisher, const rmw_message_raw_t * raw
assert(info);

eprosima::fastcdr::FastBuffer buffer(raw_message->buffer, raw_message->buffer_length);
eprosima::fastcdr::Cdr ser(buffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN,
eprosima::fastcdr::Cdr::DDS_CDR);
eprosima::fastcdr::Cdr ser(
buffer, eprosima::fastcdr::Cdr::DEFAULT_ENDIAN, eprosima::fastcdr::Cdr::DDS_CDR);
if (!ser.jump(raw_message->buffer_length)) {
RMW_SET_ERROR_MSG("cannot correctly set raw buffer");
}
Expand All @@ -87,7 +87,6 @@ rmw_publish_raw(const rmw_publisher_t * publisher, const rmw_message_raw_t * raw
RMW_SET_ERROR_MSG("cannot publish data");
}

fprintf(stderr, "publishing raw\n");
return returnedValue;
}
} // extern "C"
9 changes: 5 additions & 4 deletions rmw_fastrtps_cpp/src/rmw_take.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,8 @@ rmw_take_raw(

if (sinfo.sampleKind == ALIVE) {
raw_message->buffer_length = buffer.getBufferSize();
raw_message->buffer = (char *)malloc(sizeof(char) * raw_message->buffer_length);
raw_message->buffer =
reinterpret_cast<char *>(malloc(sizeof(char) * raw_message->buffer_length));
memcpy(raw_message->buffer, buffer.getBuffer(), raw_message->buffer_length);
*taken = true;
}
Expand Down Expand Up @@ -173,18 +174,18 @@ rmw_take_raw_with_info(

if (sinfo.sampleKind == ALIVE) {
raw_message->buffer_length = buffer.getBufferSize();
raw_message->buffer = (char *)malloc(sizeof(char) * raw_message->buffer_length);
raw_message->buffer =
reinterpret_cast<char *>(malloc(sizeof(char) * raw_message->buffer_length));
memcpy(raw_message->buffer, buffer.getBuffer(), raw_message->buffer_length);
rmw_gid_t * sender_gid = &message_info->publisher_gid;
sender_gid->implementation_identifier = eprosima_fastrtps_identifier;
memset(sender_gid->data, 0, RMW_GID_STORAGE_SIZE);
memcpy(sender_gid->data, &sinfo.sample_identity.writer_guid(),
sizeof(eprosima::fastrtps::rtps::GUID_t));
sizeof(eprosima::fastrtps::rtps::GUID_t));
*taken = true;
}
}

return RMW_RET_OK;
}

} // extern "C"

0 comments on commit 4544fc6

Please sign in to comment.