Skip to content

Commit

Permalink
Rename some functions to match the style in rcl (ros2#131)
Browse files Browse the repository at this point in the history 
Signed-off-by: David Wang <david.wang@arm.com>
  • Loading branch information
@david-wang-2015 @wjwwood
david-wang-2015 authored and wjwwood committed Apr 28, 2017
1 parent bed40d3 commit 309fa5c
Show file tree
Hide file tree
Showing 3 changed files with 63 additions and 63 deletions.
26 changes: 13 additions & 13 deletions rcl/include/rcl/time.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ rcl_time_source_valid(rcl_time_source_t * time_source);
RCL_PUBLIC
RCL_WARN_UNUSED
rcl_ret_t
rcl_init_time_source(
rcl_time_source_init(
enum rcl_time_source_type_t time_source_type, rcl_time_source_t * time_source
);

Expand All @@ -135,7 +135,7 @@ rcl_init_time_source(
RCL_PUBLIC
RCL_WARN_UNUSED
rcl_ret_t
rcl_fini_time_source(rcl_time_source_t * time_source);
rcl_time_source_fini(rcl_time_source_t * time_source);

/// Initialize a time_source as a RCL_ROS_TIME time source.
/**
Expand All @@ -150,7 +150,7 @@ rcl_fini_time_source(rcl_time_source_t * time_source);
RCL_PUBLIC
RCL_WARN_UNUSED
rcl_ret_t
rcl_init_ros_time_source(rcl_time_source_t * time_source);
rcl_ros_time_source_init(rcl_time_source_t * time_source);

/// Finalize a time_source as a `RCL_ROS_TIME` time source.
/**
Expand All @@ -166,7 +166,7 @@ rcl_init_ros_time_source(rcl_time_source_t * time_source);
RCL_PUBLIC
RCL_WARN_UNUSED
rcl_ret_t
rcl_fini_ros_time_source(rcl_time_source_t * time_source);
rcl_ros_time_source_fini(rcl_time_source_t * time_source);

/// Initialize a time_source as a `RCL_STEADY_TIME` time source.
/**
Expand All @@ -181,7 +181,7 @@ rcl_fini_ros_time_source(rcl_time_source_t * time_source);
RCL_PUBLIC
RCL_WARN_UNUSED
rcl_ret_t
rcl_init_steady_time_source(rcl_time_source_t * time_source);
rcl_steady_time_source_init(rcl_time_source_t * time_source);

/// Finalize a time_source as a `RCL_STEADY_TIME` time source.
/**
Expand All @@ -199,7 +199,7 @@ rcl_init_steady_time_source(rcl_time_source_t * time_source);
RCL_PUBLIC
RCL_WARN_UNUSED
rcl_ret_t
rcl_fini_steady_time_source(rcl_time_source_t * time_source);
rcl_steady_time_source_fini(rcl_time_source_t * time_source);

/// Initialize a time_source as a `RCL_SYSTEM_TIME` time source.
/**
Expand All @@ -216,7 +216,7 @@ rcl_fini_steady_time_source(rcl_time_source_t * time_source);
RCL_PUBLIC
RCL_WARN_UNUSED
rcl_ret_t
rcl_init_system_time_source(rcl_time_source_t * time_source);
rcl_system_time_source_init(rcl_time_source_t * time_source);

/// Finalize a time_source as a `RCL_SYSTEM_TIME` time source.
/**
Expand All @@ -234,7 +234,7 @@ rcl_init_system_time_source(rcl_time_source_t * time_source);
RCL_PUBLIC
RCL_WARN_UNUSED
rcl_ret_t
rcl_fini_system_time_source(rcl_time_source_t * time_source);
rcl_system_time_source_fini(rcl_time_source_t * time_source);

/// Initialize a time point using the time_source.
/**
Expand All @@ -255,7 +255,7 @@ rcl_fini_system_time_source(rcl_time_source_t * time_source);
RCL_PUBLIC
RCL_WARN_UNUSED
rcl_ret_t
rcl_init_time_point(rcl_time_point_t * time_point, rcl_time_source_t * time_source);
rcl_time_point_init(rcl_time_point_t * time_point, rcl_time_source_t * time_source);

/// Finalize a time_point
/**
Expand All @@ -271,7 +271,7 @@ rcl_init_time_point(rcl_time_point_t * time_point, rcl_time_source_t * time_sour
RCL_PUBLIC
RCL_WARN_UNUSED
rcl_ret_t
rcl_fini_time_point(rcl_time_point_t * time_point);
rcl_time_point_fini(rcl_time_point_t * time_point);

/// Initialize a duration using the time_source.
/**
Expand All @@ -290,7 +290,7 @@ rcl_fini_time_point(rcl_time_point_t * time_point);
RCL_PUBLIC
RCL_WARN_UNUSED
rcl_ret_t
rcl_init_duration(rcl_duration_t * duration, rcl_time_source_t * time_source);
rcl_duration_init(rcl_duration_t * duration, rcl_time_source_t * time_source);

/// Finalize a duration
/**
Expand All @@ -306,7 +306,7 @@ rcl_init_duration(rcl_duration_t * duration, rcl_time_source_t * time_source);
RCL_PUBLIC
RCL_WARN_UNUSED
rcl_ret_t
rcl_fini_duration(rcl_duration_t * duration);
rcl_duration_fini(rcl_duration_t * duration);

/// Get the default `RCL_ROS_TIME` time source
/**
Expand Down Expand Up @@ -414,7 +414,7 @@ rcl_difference_times(rcl_time_point_t * start, rcl_time_point_t * finish,
RCL_PUBLIC
RCL_WARN_UNUSED
rcl_ret_t
rcl_get_time_point_now(rcl_time_point_t * time_point);
rcl_time_point_get_now(rcl_time_point_t * time_point);


/// Enable the ROS time abstraction override.
Expand Down
44 changes: 22 additions & 22 deletions rcl/src/rcl/time.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ rcl_time_source_valid(rcl_time_source_t * time_source)
}

rcl_ret_t
rcl_init_time_source(
rcl_time_source_init(
enum rcl_time_source_type_t time_source_type, rcl_time_source_t * time_source
)
{
Expand All @@ -99,26 +99,26 @@ rcl_init_time_source(
rcl_init_generic_time_source(time_source);
return RCL_RET_OK;
case RCL_ROS_TIME:
return rcl_init_ros_time_source(time_source);
return rcl_ros_time_source_init(time_source);
case RCL_SYSTEM_TIME:
return rcl_init_system_time_source(time_source);
return rcl_system_time_source_init(time_source);
case RCL_STEADY_TIME:
return rcl_init_steady_time_source(time_source);
return rcl_steady_time_source_init(time_source);
default:
return RCL_RET_INVALID_ARGUMENT;
}
}

rcl_ret_t
rcl_fini_time_source(rcl_time_source_t * time_source)
rcl_time_source_fini(rcl_time_source_t * time_source)
{
switch (time_source->type) {
case RCL_ROS_TIME:
return rcl_fini_ros_time_source(time_source);
return rcl_ros_time_source_fini(time_source);
case RCL_SYSTEM_TIME:
return rcl_fini_system_time_source(time_source);
return rcl_system_time_source_fini(time_source);
case RCL_STEADY_TIME:
return rcl_fini_steady_time_source(time_source);
return rcl_steady_time_source_fini(time_source);
case RCL_TIME_SOURCE_UNINITIALIZED:
// fall through
default:
Expand All @@ -127,7 +127,7 @@ rcl_fini_time_source(rcl_time_source_t * time_source)
}

rcl_ret_t
rcl_init_ros_time_source(rcl_time_source_t * time_source)
rcl_ros_time_source_init(rcl_time_source_t * time_source)
{
RCL_CHECK_ARGUMENT_FOR_NULL(time_source, RCL_RET_INVALID_ARGUMENT, rcl_get_default_allocator());
rcl_init_generic_time_source(time_source);
Expand All @@ -138,7 +138,7 @@ rcl_init_ros_time_source(rcl_time_source_t * time_source)
}

rcl_ret_t
rcl_fini_ros_time_source(rcl_time_source_t * time_source)
rcl_ros_time_source_fini(rcl_time_source_t * time_source)
{
RCL_CHECK_ARGUMENT_FOR_NULL(time_source, RCL_RET_INVALID_ARGUMENT, rcl_get_default_allocator());
if (time_source->type != RCL_ROS_TIME) {
Expand All @@ -150,7 +150,7 @@ rcl_fini_ros_time_source(rcl_time_source_t * time_source)
}

rcl_ret_t
rcl_init_steady_time_source(rcl_time_source_t * time_source)
rcl_steady_time_source_init(rcl_time_source_t * time_source)
{
RCL_CHECK_ARGUMENT_FOR_NULL(time_source, RCL_RET_INVALID_ARGUMENT, rcl_get_default_allocator());
rcl_init_generic_time_source(time_source);
Expand All @@ -160,7 +160,7 @@ rcl_init_steady_time_source(rcl_time_source_t * time_source)
}

rcl_ret_t
rcl_fini_steady_time_source(rcl_time_source_t * time_source)
rcl_steady_time_source_fini(rcl_time_source_t * time_source)
{
RCL_CHECK_ARGUMENT_FOR_NULL(time_source, RCL_RET_INVALID_ARGUMENT, rcl_get_default_allocator());
if (time_source->type != RCL_STEADY_TIME) {
Expand All @@ -171,7 +171,7 @@ rcl_fini_steady_time_source(rcl_time_source_t * time_source)
}

rcl_ret_t
rcl_init_system_time_source(rcl_time_source_t * time_source)
rcl_system_time_source_init(rcl_time_source_t * time_source)
{
RCL_CHECK_ARGUMENT_FOR_NULL(time_source, RCL_RET_INVALID_ARGUMENT, rcl_get_default_allocator());
rcl_init_generic_time_source(time_source);
Expand All @@ -181,7 +181,7 @@ rcl_init_system_time_source(rcl_time_source_t * time_source)
}

rcl_ret_t
rcl_fini_system_time_source(rcl_time_source_t * time_source)
rcl_system_time_source_fini(rcl_time_source_t * time_source)
{
RCL_CHECK_ARGUMENT_FOR_NULL(time_source, RCL_RET_INVALID_ARGUMENT, rcl_get_default_allocator());
if (time_source->type != RCL_SYSTEM_TIME) {
Expand All @@ -192,7 +192,7 @@ rcl_fini_system_time_source(rcl_time_source_t * time_source)
}

rcl_ret_t
rcl_init_time_point(rcl_time_point_t * time_point, rcl_time_source_t * time_source)
rcl_time_point_init(rcl_time_point_t * time_point, rcl_time_source_t * time_source)
{
RCL_CHECK_ARGUMENT_FOR_NULL(time_point, RCL_RET_INVALID_ARGUMENT, rcl_get_default_allocator());
if (!time_source) {
Expand All @@ -205,15 +205,15 @@ rcl_init_time_point(rcl_time_point_t * time_point, rcl_time_source_t * time_sour
}

rcl_ret_t
rcl_fini_time_point(rcl_time_point_t * time_point)
rcl_time_point_fini(rcl_time_point_t * time_point)
{
RCL_CHECK_ARGUMENT_FOR_NULL(time_point, RCL_RET_INVALID_ARGUMENT, rcl_get_default_allocator());
(void)time_point;
return RCL_RET_OK;
}

rcl_ret_t
rcl_init_duration(rcl_duration_t * duration, rcl_time_source_t * time_source)
rcl_duration_init(rcl_duration_t * duration, rcl_time_source_t * time_source)
{
RCL_CHECK_ARGUMENT_FOR_NULL(duration, RCL_RET_INVALID_ARGUMENT, rcl_get_default_allocator());
if (!time_source) {
Expand All @@ -226,7 +226,7 @@ rcl_init_duration(rcl_duration_t * duration, rcl_time_source_t * time_source)
}

rcl_ret_t
rcl_fini_duration(rcl_duration_t * duration)
rcl_duration_fini(rcl_duration_t * duration)
{
RCL_CHECK_ARGUMENT_FOR_NULL(duration, RCL_RET_INVALID_ARGUMENT, rcl_get_default_allocator());
(void)duration;
Expand All @@ -238,7 +238,7 @@ rcl_get_default_ros_time_source(void)
{
if (!rcl_default_ros_time_source) {
rcl_default_ros_time_source = (rcl_time_source_t *)calloc(1, sizeof(rcl_time_source_t));
rcl_ret_t retval = rcl_init_ros_time_source(rcl_default_ros_time_source);
rcl_ret_t retval = rcl_ros_time_source_init(rcl_default_ros_time_source);
if (retval != RCL_RET_OK) {
return NULL;
}
Expand All @@ -251,7 +251,7 @@ rcl_get_default_steady_time_source(void)
{
if (!rcl_default_steady_time_source) {
rcl_default_steady_time_source = (rcl_time_source_t *)calloc(1, sizeof(rcl_time_source_t));
rcl_ret_t retval = rcl_init_steady_time_source(rcl_default_steady_time_source);
rcl_ret_t retval = rcl_steady_time_source_init(rcl_default_steady_time_source);
if (retval != RCL_RET_OK) {
return NULL;
}
Expand All @@ -264,7 +264,7 @@ rcl_get_default_system_time_source(void)
{
if (!rcl_default_system_time_source) {
rcl_default_system_time_source = (rcl_time_source_t *)calloc(1, sizeof(rcl_time_source_t));
rcl_ret_t retval = rcl_init_system_time_source(rcl_default_system_time_source);
rcl_ret_t retval = rcl_system_time_source_init(rcl_default_system_time_source);
if (retval != RCL_RET_OK) {
return NULL;
}
Expand Down Expand Up @@ -303,7 +303,7 @@ rcl_difference_times(rcl_time_point_t * start, rcl_time_point_t * finish,
}

rcl_ret_t
rcl_get_time_point_now(rcl_time_point_t * time_point)
rcl_time_point_get_now(rcl_time_point_t * time_point)
{
RCL_CHECK_ARGUMENT_FOR_NULL(time_point, RCL_RET_INVALID_ARGUMENT, rcl_get_default_allocator());
if (time_point->time_source && time_point->time_source->get_now) {
Expand Down
Loading

0 comments on commit 309fa5c

Please sign in to comment.