Reformat style error throw

Blast545 · Blast545 · commit ace840602e49 · 2020-09-30T14:40:48.000-03:00
Signed-off-by: Jorge Perez &lt;jjperez@ekumenlabs.com&gt;
diff --git a/rclcpp/src/rclcpp/timer.cpp b/rclcpp/src/rclcpp/timer.cpp
@@ -76,8 +76,9 @@ TimerBase::~TimerBase()
 void
 TimerBase::cancel()
 {
-  if (rcl_timer_cancel(timer_handle_.get()) != RCL_RET_OK) {
-    throw std::runtime_error(std::string("Couldn't cancel timer: ") + rcl_get_error_string().str);
+  rcl_ret_t ret = rcl_timer_cancel(timer_handle_.get());
+  if (ret != RCL_RET_OK) {
+    rclcpp::exceptions::throw_from_rcl_error(ret, "Couldn't cancel timer");
   }
 }
 
@@ -95,17 +96,19 @@ TimerBase::is_canceled()
 void
 TimerBase::reset()
 {
-  if (rcl_timer_reset(timer_handle_.get()) != RCL_RET_OK) {
-    throw std::runtime_error(std::string("Couldn't reset timer: ") + rcl_get_error_string().str);
+  rcl_ret_t ret = rcl_timer_reset(timer_handle_.get());
+  if (ret != RCL_RET_OK) {
+    rclcpp::exceptions::throw_from_rcl_error(ret, "Couldn't reset timer");
   }
 }
 
 bool
 TimerBase::is_ready()
 {
   bool ready = false;
-  if (rcl_timer_is_ready(timer_handle_.get(), &ready) != RCL_RET_OK) {
-    throw std::runtime_error(std::string("Failed to check timer: ") + rcl_get_error_string().str);
+  rcl_ret_t ret = rcl_timer_is_ready(timer_handle_.get(), &ready);
+  if (ret != RCL_RET_OK) {
+    rclcpp::exceptions::throw_from_rcl_error(ret, "Failed to check timer");
   }
   return ready;
 }
@@ -114,14 +117,10 @@ std::chrono::nanoseconds
 TimerBase::time_until_trigger()
 {
   int64_t time_until_next_call = 0;
-  if (
-    rcl_timer_get_time_until_next_call(
-      timer_handle_.get(),
-      &time_until_next_call) != RCL_RET_OK)
-  {
-    throw std::runtime_error(
-            std::string(
-              "Timer could not get time until next call: ") + rcl_get_error_string().str);
+  rcl_ret_t ret = rcl_timer_get_time_until_next_call(
+    timer_handle_.get(), &time_until_next_call);
+  if (ret != RCL_RET_OK) {
+    rclcpp::exceptions::throw_from_rcl_error(ret, "Timer could not get time until next call");
   }
   return std::chrono::nanoseconds(time_until_next_call);
 }

Original file line number	Diff line number	Diff line change
`@@ -76,8 +76,9 @@ TimerBase::~TimerBase()`
`76`	`76`	`void`
`77`	`77`	`TimerBase::cancel()`
`78`	`78`	`{`
`79`		`- if (rcl_timer_cancel(timer_handle_.get()) != RCL_RET_OK) {`
`80`		`- throw std::runtime_error(std::string("Couldn't cancel timer: ") + rcl_get_error_string().str);`
	`79`	`+ rcl_ret_t ret = rcl_timer_cancel(timer_handle_.get());`
	`80`	`+ if (ret != RCL_RET_OK) {`
	`81`	`+ rclcpp::exceptions::throw_from_rcl_error(ret, "Couldn't cancel timer");`
`81`	`82`	`}`
`82`	`83`	`}`
`83`	`84`
`@@ -95,17 +96,19 @@ TimerBase::is_canceled()`
`95`	`96`	`void`
`96`	`97`	`TimerBase::reset()`
`97`	`98`	`{`
`98`		`- if (rcl_timer_reset(timer_handle_.get()) != RCL_RET_OK) {`
`99`		`- throw std::runtime_error(std::string("Couldn't reset timer: ") + rcl_get_error_string().str);`
	`99`	`+ rcl_ret_t ret = rcl_timer_reset(timer_handle_.get());`
	`100`	`+ if (ret != RCL_RET_OK) {`
	`101`	`+ rclcpp::exceptions::throw_from_rcl_error(ret, "Couldn't reset timer");`
`100`	`102`	`}`
`101`	`103`	`}`
`102`	`104`
`103`	`105`	`bool`
`104`	`106`	`TimerBase::is_ready()`
`105`	`107`	`{`
`106`	`108`	`bool ready = false;`
`107`		`- if (rcl_timer_is_ready(timer_handle_.get(), &ready) != RCL_RET_OK) {`
`108`		`- throw std::runtime_error(std::string("Failed to check timer: ") + rcl_get_error_string().str);`
	`109`	`+ rcl_ret_t ret = rcl_timer_is_ready(timer_handle_.get(), &ready);`
	`110`	`+ if (ret != RCL_RET_OK) {`
	`111`	`+ rclcpp::exceptions::throw_from_rcl_error(ret, "Failed to check timer");`
`109`	`112`	`}`
`110`	`113`	`return ready;`
`111`	`114`	`}`
`@@ -114,14 +117,10 @@ std::chrono::nanoseconds`
`114`	`117`	`TimerBase::time_until_trigger()`
`115`	`118`	`{`
`116`	`119`	`int64_t time_until_next_call = 0;`
`117`		`- if (`
`118`		`- rcl_timer_get_time_until_next_call(`
`119`		`- timer_handle_.get(),`
`120`		`- &time_until_next_call) != RCL_RET_OK)`
`121`		`- {`
`122`		`- throw std::runtime_error(`
`123`		`- std::string(`
`124`		`- "Timer could not get time until next call: ") + rcl_get_error_string().str);`
	`120`	`+ rcl_ret_t ret = rcl_timer_get_time_until_next_call(`
	`121`	`+ timer_handle_.get(), &time_until_next_call);`
	`122`	`+ if (ret != RCL_RET_OK) {`
	`123`	`+ rclcpp::exceptions::throw_from_rcl_error(ret, "Timer could not get time until next call");`
`125`	`124`	`}`
`126`	`125`	`return std::chrono::nanoseconds(time_until_next_call);`
`127`	`126`	`}`