Skip to content

Commit

Permalink
Fixing linting errors
Browse files Browse the repository at this point in the history
Signed-off-by: Marco A. Gutierrez <[email protected]>
  • Loading branch information
Marco A. Gutierrez committed Jun 22, 2023
1 parent 49952ca commit 85bd244
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 7 deletions.
6 changes: 4 additions & 2 deletions include/sdf/parser.hh
Original file line number Diff line number Diff line change
Expand Up @@ -607,7 +607,8 @@ namespace sdf
/// \return True if all contained elements have do not share a name with
/// sibling elements of the same type.
SDFORMAT_VISIBLE
bool recursiveSameTypeUniqueNames(sdf::ElementPtr _elem, sdf::Errors &_errors);
bool recursiveSameTypeUniqueNames(sdf::ElementPtr _elem,
sdf::Errors &_errors);

/// \brief Check that all sibling elements of the any type have unique names.
/// This checks recursively and should check the files exhaustively
Expand Down Expand Up @@ -647,7 +648,8 @@ namespace sdf
/// \param[out] _errors Vector of errors.
/// \return True if all contained element names do not have the delimiter '::'
SDFORMAT_VISIBLE
bool recursiveSiblingNoDoubleColonInNames(sdf::ElementPtr _elem, sdf::Errors &_errors);
bool recursiveSiblingNoDoubleColonInNames(sdf::ElementPtr _elem,
sdf::Errors &_errors);

/// \brief Check whether the element should be validated. If this returns
/// false, validators such as the unique name and reserve name checkers should
Expand Down
11 changes: 6 additions & 5 deletions src/parser.cc
Original file line number Diff line number Diff line change
Expand Up @@ -879,14 +879,14 @@ bool readFileInternal(const std::string &_filename, const bool _convert,
else
{
_errors.push_back({ErrorCode::PARSING_ERROR,
"Failed to parse the URDF file after converting to SDFormat."});
"Failed to parse the URDF file after converting to SDFormat."});
return false;
}
}
else
{
_errors.push_back({ErrorCode::PARSING_ERROR,
"XML does not seem to be an SDFormat or an URDF file."});
"XML does not seem to be an SDFormat or an URDF file."});
return false;
}
}
Expand Down Expand Up @@ -972,14 +972,14 @@ bool readStringInternal(const std::string &_xmlString, const bool _convert,
else
{
_errors.push_back({ErrorCode::PARSING_ERROR,
"Failed to parse the URDF file after converting to SDFormat."});
"Failed to parse the URDF file after converting to SDFormat."});
return false;
}
}
else
{
_errors.push_back({ErrorCode::PARSING_ERROR,
"XML does not seem to be an SDFormat or an URDF string."});
"XML does not seem to be an SDFormat or an URDF string."});
return false;
}
}
Expand Down Expand Up @@ -2516,7 +2516,8 @@ bool recursiveSiblingNoDoubleColonInNames(sdf::ElementPtr _elem)
}

//////////////////////////////////////////////////
bool recursiveSiblingNoDoubleColonInNames(sdf::ElementPtr _elem, sdf::Errors &_errors)
bool recursiveSiblingNoDoubleColonInNames(sdf::ElementPtr _elem,
sdf::Errors &_errors)
{
if (!shouldValidateElement(_elem))
return true;
Expand Down

0 comments on commit 85bd244

Please sign in to comment.