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
@@ -388,7 +388,7 @@ ACCELSIM::transfer(uint8_t *send, uint8_t *recv, unsigned len)
// Get data from the simulator
Simulator *sim = Simulator::getInstance();
if (sim == NULL) {
if (sim == nullptr) {
return ENODEV;
}
@@ -1159,7 +1159,7 @@ accelsim_main(int argc, char *argv[])
enum Rotation rotation = ROTATION_NONE;
int ret;
int myoptind = 1;
const char *myoptarg = NULL;
const char *myoptarg = nullptr;
/* jump over start/off/etc and look at options first */
while ((ch = px4_getopt(argc, argv, "R:", &myoptind, &myoptarg)) != EOF) {
@@ -425,7 +425,7 @@ AirspeedSim::transfer(const uint8_t *send, unsigned send_len, uint8_t *recv, uns
// this is equivalent to the collect phase
Simulator *sim = Simulator::getInstance();
if (sim == NULL) {
if (sim == nullptr) {
PX4_ERR("Error BARO_SIM::transfer no simulator");
return -ENODEV;
}
+2 -2
View File
@@ -620,7 +620,7 @@ BAROSIM::transfer(const uint8_t *send, unsigned send_len, uint8_t *recv, unsigne
/* read requested */
Simulator *sim = Simulator::getInstance();
if (sim == NULL) {
if (sim == nullptr) {
PX4_ERR("Error BAROSIM_DEV::transfer no simulator");
return -ENODEV;
}
@@ -785,7 +785,7 @@ start()
if (g_barosim != nullptr && OK != g_barosim->init()) {
delete g_barosim;
g_barosim = NULL;
g_barosim = nullptr;
PX4_ERR("bus init failed");
return false;
}
@@ -641,16 +641,16 @@ rgbledsim_main(int argc, char *argv[])
/* jump over start/off/etc and look at options first */
int myoptind = 1;
const char *myoptarg = NULL;
const char *myoptarg = nullptr;
while ((ch = px4_getopt(argc, argv, "a:b:", &myoptind, &myoptarg)) != EOF) {
switch (ch) {
case 'a':
rgbledadr = strtol(myoptarg, NULL, 0);
rgbledadr = strtol(myoptarg, nullptr, 0);
break;
case 'b':
i2cdevice = strtol(myoptarg, NULL, 0);
i2cdevice = strtol(myoptarg, nullptr, 0);
break;
default:
@@ -783,9 +783,9 @@ rgbledsim_main(int argc, char *argv[])
}
rgbled_rgbset_t v;
v.red = strtol(argv[2], NULL, 0);
v.green = strtol(argv[3], NULL, 0);
v.blue = strtol(argv[4], NULL, 0);
v.red = strtol(argv[2], nullptr, 0);
v.green = strtol(argv[3], nullptr, 0);
v.blue = strtol(argv[4], nullptr, 0);
ret = h.ioctl(RGBLED_SET_RGB, (unsigned long)&v);
ret = h.ioctl(RGBLED_SET_MODE, (unsigned long)RGBLED_MODE_ON);
DevMgr::releaseHandle(h);
+5 -5
View File
@@ -159,7 +159,7 @@ static int mkpath(const char *path, mode_t mode)
status = 0;
pp = copypath;
while (status == 0 && (sp = strchr(pp, '/')) != 0) {
while (status == 0 && (sp = strchr(pp, '/')) != nullptr) {
if (sp != pp) {
/* Neither root nor double slash in path */
*sp = '\0';
@@ -214,7 +214,7 @@ static void run_cmd(const vector<string> &appargs, bool exit_on_fail, bool silen
++i;
}
arg[i] = (char *)0;
arg[i] = (char *)nullptr;
int retval = apps[command](i, (char **)arg);
@@ -310,9 +310,9 @@ int main(int argc, char **argv)
sig_fpe.sa_handler = _SigFpeHandler;
sig_fpe.sa_flags = 0;// not SA_RESTART!;
sigaction(SIGINT, &sig_int, NULL);
sigaction(SIGINT, &sig_int, nullptr);
//sigaction(SIGTERM, &sig_int, NULL);
sigaction(SIGFPE, &sig_fpe, NULL);
sigaction(SIGFPE, &sig_fpe, nullptr);
set_cpu_scaling();
@@ -514,7 +514,7 @@ int main(int argc, char **argv)
term.c_lflag &= ~ICANON;
term.c_lflag &= ~ECHO;
tcsetattr(0, TCSANOW, &term);
setbuf(stdin, NULL);
setbuf(stdin, nullptr);
while (!_ExitFlag) {
@@ -108,7 +108,7 @@ static void *entry_adapter(void *ptr)
px4_task_exit(0);
PX4_DEBUG("After px4_task_exit");
return NULL;
return nullptr;
}
void
@@ -134,10 +134,10 @@ px4_task_t px4_task_spawn_cmd(const char *name, int scheduler, int priority, int
struct sched_param param = {};
// Calculate argc
while (p != (char *)0) {
while (p != (char *)nullptr) {
p = argv[argc];
if (p == (char *)0) {
if (p == (char *)nullptr) {
break;
}
@@ -165,7 +165,7 @@ px4_task_t px4_task_spawn_cmd(const char *name, int scheduler, int priority, int
}
// Must add NULL at end of argv
taskdata->argv[argc] = (char *)0;
taskdata->argv[argc] = (char *)nullptr;
PX4_DEBUG("starting task %s", name);
@@ -249,7 +249,7 @@ px4_task_t px4_task_spawn_cmd(const char *name, int scheduler, int priority, int
if (rv == EPERM) {
//printf("WARNING: NOT RUNING AS ROOT, UNABLE TO RUN REALTIME THREADS\n");
rv = pthread_create(&taskmap[taskid].pid, NULL, &entry_adapter, (void *) taskdata);
rv = pthread_create(&taskmap[taskid].pid, nullptr, &entry_adapter, (void *) taskdata);
if (rv != 0) {
PX4_ERR("px4_task_spawn_cmd: failed to create thread %d %d\n", rv, errno);
@@ -293,7 +293,7 @@ int px4_task_delete(px4_task_t id)
if (pthread_self() == pid) {
taskmap[id].isused = false;
pthread_mutex_unlock(&task_mutex);
pthread_exit(0);
pthread_exit(nullptr);
} else {
rv = pthread_cancel(pid);