clang-tidy modernize-use-nullptr

This commit is contained in:
Daniel Agar
2017-02-01 22:15:50 -05:00
parent ec2467d4a5
commit e927f3e040
48 changed files with 155 additions and 153 deletions
+3 -3
View File
@@ -86,7 +86,7 @@ void
RingBuffer::flush()
{
while (!empty()) {
get(NULL);
get(nullptr);
}
}
@@ -179,7 +179,7 @@ RingBuffer::force(const void *val, size_t val_size)
break;
}
get(NULL);
get(nullptr);
overwrote = true;
}
@@ -281,7 +281,7 @@ RingBuffer::get(void *val, size_t val_size)
next = _next(candidate);
/* go ahead and read from this index */
if (val != NULL) {
if (val != nullptr) {
memcpy(val, &_buf[candidate * _item_size], val_size);
}
+8 -8
View File
@@ -139,7 +139,7 @@ VDev::register_driver(const char *name, void *data)
PX4_DEBUG("VDev::register_driver %s", name);
int ret = -ENOSPC;
if (name == NULL || data == NULL) {
if (name == nullptr || data == nullptr) {
return -EINVAL;
}
@@ -156,7 +156,7 @@ VDev::register_driver(const char *name, void *data)
}
for (int i = 0; i < PX4_MAX_DEV; ++i) {
if (devmap[i] == NULL) {
if (devmap[i] == nullptr) {
devmap[i] = new px4_dev_t(name, (void *)data);
PX4_DEBUG("Registered DEV %s", name);
ret = PX4_OK;
@@ -179,7 +179,7 @@ VDev::unregister_driver(const char *name)
PX4_DEBUG("VDev::unregister_driver %s", name);
int ret = -EINVAL;
if (name == NULL) {
if (name == nullptr) {
return -EINVAL;
}
@@ -188,7 +188,7 @@ VDev::unregister_driver(const char *name)
for (int i = 0; i < PX4_MAX_DEV; ++i) {
if (devmap[i] && (strcmp(name, devmap[i]->name) == 0)) {
delete devmap[i];
devmap[i] = NULL;
devmap[i] = nullptr;
PX4_DEBUG("Unregistered DEV %s", name);
ret = PX4_OK;
break;
@@ -213,7 +213,7 @@ VDev::unregister_class_devname(const char *class_devname, unsigned class_instanc
if (devmap[i] && strcmp(devmap[i]->name, name) == 0) {
delete devmap[i];
PX4_DEBUG("Unregistered class DEV %s", name);
devmap[i] = NULL;
devmap[i] = nullptr;
pthread_mutex_unlock(&devmutex);
return PX4_OK;
}
@@ -551,7 +551,7 @@ VDev *VDev::getDev(const char *path)
pthread_mutex_unlock(&devmutex);
return NULL;
return nullptr;
}
void VDev::showDevices()
@@ -628,7 +628,7 @@ const char *VDev::topicList(unsigned int *next)
}
}
return NULL;
return nullptr;
}
const char *VDev::devList(unsigned int *next)
@@ -639,7 +639,7 @@ const char *VDev::devList(unsigned int *next)
}
}
return NULL;
return nullptr;
}
} // namespace device
+4 -4
View File
@@ -67,7 +67,7 @@ extern "C" {
inline bool valid_fd(int fd)
{
pthread_mutex_lock(&filemutex);
bool ret = (fd < PX4_MAX_FD && fd >= 0 && filemap[fd] != NULL);
bool ret = (fd < PX4_MAX_FD && fd >= 0 && filemap[fd] != nullptr);
pthread_mutex_unlock(&filemutex);
return ret;
}
@@ -75,7 +75,7 @@ extern "C" {
inline VDev *get_vdev(int fd)
{
pthread_mutex_lock(&filemutex);
bool valid = (fd < PX4_MAX_FD && fd >= 0 && filemap[fd] != NULL);
bool valid = (fd < PX4_MAX_FD && fd >= 0 && filemap[fd] != nullptr);
VDev *dev;
if (valid) {
@@ -115,7 +115,7 @@ extern "C" {
pthread_mutex_lock(&filemutex);
for (i = 0; i < PX4_MAX_FD; ++i) {
if (filemap[i] == 0) {
if (filemap[i] == nullptr) {
filemap[i] = new device::file_t(flags, dev, i);
break;
}
@@ -290,7 +290,7 @@ extern "C" {
for (i = 0; i < nfds; ++i) {
fds[i].sem = &sem;
fds[i].revents = 0;
fds[i].priv = NULL;
fds[i].priv = nullptr;
VDev *dev = get_vdev(fds[i].fd);
+1 -1
View File
@@ -320,7 +320,7 @@ int GPS::init()
{
char gps_num[2] = {(char)('0' + _gps_num), 0};
char *const args[2] = { gps_num, NULL };
char *const args[2] = { gps_num, nullptr };
/* start the GPS driver worker task */
_task = px4_task_spawn_cmd("gps", SCHED_DEFAULT,
+6 -6
View File
@@ -191,7 +191,7 @@ PWMSim::PWMSim() :
_poll_fds{},
_poll_fds_num(0),
_armed_sub(-1),
_outputs_pub(0),
_outputs_pub(nullptr),
_num_outputs(0),
_primary_pwm_device(false),
_groups_required(0),
@@ -487,7 +487,7 @@ PWMSim::task_main()
}
/* do mixing */
num_outputs = _mixers->mix(&outputs.output[0], num_outputs, NULL);
num_outputs = _mixers->mix(&outputs.output[0], num_outputs, nullptr);
outputs.noutputs = num_outputs;
outputs.timestamp = hrt_absolute_time();
@@ -957,13 +957,13 @@ fake(int argc, char *argv[])
actuator_controls_s ac;
ac.control[0] = strtol(argv[1], 0, 0) / 100.0f;
ac.control[0] = strtol(argv[1], nullptr, 0) / 100.0f;
ac.control[1] = strtol(argv[2], 0, 0) / 100.0f;
ac.control[1] = strtol(argv[2], nullptr, 0) / 100.0f;
ac.control[2] = strtol(argv[3], 0, 0) / 100.0f;
ac.control[2] = strtol(argv[3], nullptr, 0) / 100.0f;
ac.control[3] = strtol(argv[4], 0, 0) / 100.0f;
ac.control[3] = strtol(argv[4], nullptr, 0) / 100.0f;
orb_advert_t handle = orb_advertise(ORB_ID_VEHICLE_ATTITUDE_CONTROLS, &ac);
+1 -1
View File
@@ -161,7 +161,7 @@ static int vmount_thread_main(int argc, char *argv[])
for (int i = 0 ; i < 3; ++i) {
if (!strcmp(argv[1], axis_names[i])) {
long angle_deg = strtol(argv[2], NULL, 0);
long angle_deg = strtol(argv[2], nullptr, 0);
angles[i] = (float)angle_deg;
found_axis = true;
}