rangefinders : remove annoying gotos

This commit is contained in:
Kabir Mohammed
2015-10-28 22:38:38 +01:00
committed by Lorenz Meier
parent 83b70688d7
commit 792f1747c7
6 changed files with 17 additions and 17 deletions
+3 -3
View File
@@ -114,14 +114,14 @@ int LidarLiteI2C::init()
/* do I2C init (and probe) first */
if (I2C::init() != OK) {
goto out;
return ret;
}
/* allocate basic report buffers */
_reports = new ringbuffer::RingBuffer(2, sizeof(struct distance_sensor_s));
if (_reports == nullptr) {
goto out;
return ret;
}
_class_instance = register_class_devname(RANGE_FINDER_BASE_DEVICE_PATH);
@@ -140,7 +140,7 @@ int LidarLiteI2C::init()
ret = OK;
/* sensor is ok, but we don't really know if it is within range */
_sensor_ok = true;
out:
return ret;
}
+1 -1
View File
@@ -109,7 +109,7 @@ int LidarLitePWM::init()
_class_instance = register_class_devname(RANGE_FINDER_BASE_DEVICE_PATH);
/* get a publish handle on the distance_sensor topic */
struct distance_sensor_s ds_report;
struct distance_sensor_s ds_report = {};
measure();
_reports->get(&ds_report);
_distance_sensor_topic = orb_advertise_multi(ORB_ID(distance_sensor), &ds_report,