Skip to content

Commit

Permalink
Delete old group data stuff
Browse files Browse the repository at this point in the history
Signed-off-by: Ivan Santiago Paunovic <[email protected]>
  • Loading branch information
ivanpauno committed Oct 25, 2019
1 parent 98175eb commit fa404fc
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 50 deletions.
11 changes: 0 additions & 11 deletions rmw_fastrtps_cpp/src/rmw_client.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -147,17 +147,6 @@ rmw_create_client(
publisherParam.topic.topicName = _create_topic_name(
qos_policies, ros_service_requester_prefix, service_name, "Request");

if (node->name || node->namespace_) {
get_group_data_qos(
node->name,
node->namespace_,
subscriberParam.qos.m_groupData);
get_group_data_qos(
node->name,
node->namespace_,
publisherParam.qos.m_groupData);
}

RCUTILS_LOG_DEBUG_NAMED(
"rmw_fastrtps_cpp",
"************ Client Details *********");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,6 @@ get_datawriter_qos(
const rmw_qos_profile_t & qos_policies,
eprosima::fastrtps::PublisherAttributes & pattr);

RMW_FASTRTPS_SHARED_CPP_PUBLIC
rmw_ret_t
get_group_data_qos(
const char * node_name,
const char * node_namespace,
eprosima::fastrtps::GroupDataQosPolicy & group_data);

template<typename AttributeT>
void
dds_qos_to_rmw_qos(
Expand Down
32 changes: 0 additions & 32 deletions rmw_fastrtps_shared_cpp/src/qos.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -165,38 +165,6 @@ is_valid_qos(const rmw_qos_profile_t & /* qos_policies */)
return true;
}

rmw_ret_t
get_group_data_qos(
const char * node_name,
const char * node_namespace,
eprosima::fastrtps::GroupDataQosPolicy & group_data)
{
if (!node_name) {
RMW_SET_ERROR_MSG("node_name is null");
return RMW_RET_ERROR;
}
if (!node_namespace) {
RMW_SET_ERROR_MSG("node_namespace is null");
return RMW_RET_ERROR;
}
size_t length = strlen(node_name) + strlen("name=;") +
strlen(node_namespace) + strlen("namespace=;") + 1;
std::vector<eprosima::fastrtps::rtps::octet> octet_vector;
octet_vector.resize(length);
int written = snprintf(
reinterpret_cast<char *>(octet_vector.data()),
length,
"name=%s;namespace=%s;",
node_name,
node_namespace);
if (written < 0 || written > static_cast<int>(length) - 1) {
RMW_SET_ERROR_MSG("failed to populate group_data buffer");
return RMW_RET_ERROR;
}
group_data.setValue(octet_vector);
return RMW_RET_OK;
}

template<typename AttributeT>
void
dds_qos_to_rmw_qos(
Expand Down

0 comments on commit fa404fc

Please sign in to comment.