Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use rcutils_get_env instead of getenv() in node_options.cpp #987

Closed
wants to merge 2 commits into from
Closed

use rcutils_get_env instead of getenv() in node_options.cpp #987

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3be919f
use rcutils_get_env instead of getenv() in node_options.cpp
suyashb95 Feb 13, 2020
3fcf556
remove check for Windows in get_domain_id_from_env()
suyashb95 Feb 13, 2020
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
14 changes: 4 additions & 10 deletions rclcpp/src/rclcpp/node_options.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include "rclcpp/logging.hpp"
#include "rclcpp/publisher_options.hpp"
#include "rclcpp/qos.hpp"
#include "rcutils/get_env.h"

using rclcpp::exceptions::throw_from_rcl_error;

Expand Down Expand Up @@ -308,21 +309,14 @@ NodeOptions::allocator(rcl_allocator_t allocator)
return *this;
}

// TODO(wjwwood): reuse rcutils_get_env() to avoid code duplication.
// See also: https://github.com/ros2/rcl/issues/119
size_t
NodeOptions::get_domain_id_from_env() const
{
// Determine the domain id based on the options and the ROS_DOMAIN_ID env variable.
size_t domain_id = std::numeric_limits<size_t>::max();
char * ros_domain_id = nullptr;
const char * ros_domain_id = nullptr;
const char * env_var = "ROS_DOMAIN_ID";
#ifndef _WIN32
ros_domain_id = getenv(env_var);
#else
size_t ros_domain_id_size;
_dupenv_s(&ros_domain_id, &ros_domain_id_size, env_var);
#endif
rcutils_get_env(env_var, &ros_domain_id);

if (ros_domain_id) {
uint32_t number = strtoul(ros_domain_id, NULL, 0);
if (number == (std::numeric_limits<uint32_t>::max)()) {
Expand Down