Skip to content

Commit cf0d434

Browse files
committed
Rename to avoid confusion with Handle pattern
Signed-off-by: Michael X. Grey <[email protected]>
1 parent 5abbb34 commit cf0d434

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

rclrs/src/node.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ impl Node {
194194
getter: unsafe extern "C" fn(*const rcl_node_t) -> *const c_char,
195195
) -> String {
196196
let rcl_node = self.handle.rcl_node.lock().unwrap();
197-
unsafe { call_string_getter_with_handle(&rcl_node, getter) }
197+
unsafe { call_string_getter_with_rcl_node(&rcl_node, getter) }
198198
}
199199

200200
/// Creates a [`Client`][1].
@@ -446,7 +446,7 @@ impl Node {
446446
// function, which is why it's not merged into Node::call_string_getter().
447447
// This function is unsafe since it's possible to pass in an rcl_node_t with dangling
448448
// pointers etc.
449-
pub(crate) unsafe fn call_string_getter_with_handle(
449+
pub(crate) unsafe fn call_string_getter_with_rcl_node(
450450
rcl_node: &rcl_node_t,
451451
getter: unsafe extern "C" fn(*const rcl_node_t) -> *const c_char,
452452
) -> String {

rclrs/src/parameter.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ pub(crate) use override_map::*;
55
pub use value::*;
66

77
use crate::rcl_bindings::*;
8-
use crate::{call_string_getter_with_handle, RclrsError};
8+
use crate::{call_string_getter_with_rcl_node, RclrsError};
99
use std::collections::{btree_map::Entry, BTreeMap};
1010
use std::fmt::Debug;
1111
use std::marker::PhantomData;
@@ -781,7 +781,7 @@ impl ParameterInterface {
781781
global_arguments: &rcl_arguments_t,
782782
) -> Result<Self, RclrsError> {
783783
let override_map = unsafe {
784-
let fqn = call_string_getter_with_handle(rcl_node, rcl_node_get_fully_qualified_name);
784+
let fqn = call_string_getter_with_rcl_node(rcl_node, rcl_node_get_fully_qualified_name);
785785
resolve_parameter_overrides(&fqn, node_arguments, global_arguments)?
786786
};
787787

0 commit comments

Comments
 (0)