Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions rmw/include/rmw/validate_full_topic_name.h
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,22 @@ rmw_validate_full_topic_name(
int * validation_result,
size_t * invalid_index);

/// Deterimine if a given topic name is valid.
/**
* This is an overload with an extra parameter for the length of topic_name.
* \param[in] topic_name_length The number of characters in topic_name.
*
* \sa rmw_validate_full_topic_name(const char *, int *, size_t *)
*/
RMW_PUBLIC
RMW_WARN_UNUSED
rmw_ret_t
rmw_validate_full_topic_name_with_size(
const char * topic_name,
size_t topic_name_length,
int * validation_result,
size_t * invalid_index);

/// Return a validation result description, or NULL if unknown or RMW_TOPIC_VALID.
RMW_PUBLIC
RMW_WARN_UNUSED
Expand Down
16 changes: 16 additions & 0 deletions rmw/include/rmw/validate_namespace.h
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,22 @@ rmw_validate_namespace(
int * validation_result,
size_t * invalid_index);

/// Deterimine if a given namespace is valid.
/**
* This is an overload with an extra parameter for the length of namespace_.
* \param[in] namespace_length The number of characters in namespace_.
*
* \sa rmw_validate_namespace(const char *, int *, size_t *)
*/
RMW_PUBLIC
RMW_WARN_UNUSED
rmw_ret_t
rmw_validate_namespace_with_size(
const char * namespace_,
size_t namespace_length,
int * validation_result,
size_t * invalid_index);

/// Return a validation result description, or NULL if unknown or RMW_NAMESPACE_VALID.
RMW_PUBLIC
RMW_WARN_UNUSED
Expand Down
16 changes: 16 additions & 0 deletions rmw/include/rmw/validate_node_name.h
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,22 @@ rmw_validate_node_name(
int * validation_result,
size_t * invalid_index);

/// Deterimine if a given node name is valid.
/**
* This is an overload with an extra parameter for the length of node_name.
* \param[in] node_name_length The number of characters in node_name.
*
* \sa rmw_validate_node_name(const char *, int *, size_t *)
*/
RMW_PUBLIC
RMW_WARN_UNUSED
rmw_ret_t
rmw_validate_node_name_with_size(
const char * node_name,
size_t node_name_length,
int * validation_result,
size_t * invalid_index);

/// Return a validation result description, or NULL if unknown or RMW_NODE_NAME_VALID.
RMW_PUBLIC
RMW_WARN_UNUSED
Expand Down
15 changes: 14 additions & 1 deletion rmw/src/validate_full_topic_name.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,27 @@ rmw_validate_full_topic_name(
const char * topic_name,
int * validation_result,
size_t * invalid_index)
{
if (!topic_name) {
return RMW_RET_INVALID_ARGUMENT;
}
return rmw_validate_full_topic_name_with_size(
topic_name, strlen(topic_name), validation_result, invalid_index);
}

rmw_ret_t
rmw_validate_full_topic_name_with_size(
const char * topic_name,
size_t topic_name_length,
int * validation_result,
size_t * invalid_index)
{
if (!topic_name) {
return RMW_RET_INVALID_ARGUMENT;
}
if (!validation_result) {
return RMW_RET_INVALID_ARGUMENT;
}
size_t topic_name_length = strlen(topic_name);
if (topic_name_length == 0) {
*validation_result = RMW_TOPIC_INVALID_IS_EMPTY_STRING;
if (invalid_index) {
Expand Down
15 changes: 14 additions & 1 deletion rmw/src/validate_namespace.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,20 @@ rmw_validate_namespace(
const char * namespace_,
int * validation_result,
size_t * invalid_index)
{
if (!namespace_) {
return RMW_RET_INVALID_ARGUMENT;
}
return rmw_validate_namespace_with_size(
namespace_, strlen(namespace_), validation_result, invalid_index);
}

rmw_ret_t
rmw_validate_namespace_with_size(
const char * namespace_,
size_t namespace_length,
int * validation_result,
size_t * invalid_index)
{
if (!namespace_) {
return RMW_RET_INVALID_ARGUMENT;
Expand All @@ -36,7 +50,6 @@ rmw_validate_namespace(
return RMW_RET_INVALID_ARGUMENT;
}

size_t namespace_length = strlen(namespace_);
// Special case for root namepsace
if (namespace_length == 1 && namespace_[0] == '/') {
// Ok to return here, it is valid and will not exceed RMW_NAMESPACE_MAX_LENGTH.
Expand Down
15 changes: 14 additions & 1 deletion rmw/src/validate_node_name.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,27 @@ rmw_validate_node_name(
const char * node_name,
int * validation_result,
size_t * invalid_index)
{
if (!node_name) {
return RMW_RET_INVALID_ARGUMENT;
}
return rmw_validate_node_name_with_size(
node_name, strlen(node_name), validation_result, invalid_index);
}

rmw_ret_t
rmw_validate_node_name_with_size(
const char * node_name,
size_t node_name_length,
int * validation_result,
size_t * invalid_index)
{
if (!node_name) {
return RMW_RET_INVALID_ARGUMENT;
}
if (!validation_result) {
return RMW_RET_INVALID_ARGUMENT;
}
size_t node_name_length = strlen(node_name);
if (node_name_length == 0) {
*validation_result = RMW_NODE_NAME_INVALID_IS_EMPTY_STRING;
if (invalid_index) {
Expand Down