fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-07-21 23:20:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

orb: avoid unnecessary string duplication of objname

Browse Source
This commit is contained in:
Beat Küng
2016-06-06 15:49:06 +02:00
committed by Lorenz Meier
parent 5125fc3a81
commit f5310ca51e
2 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/uORB/uORBDevices_nuttx.cpp
+1 -9
View File
@@ -673,18 +673,12 @@ uORB::DeviceMaster::ioctl(struct file *filp, int cmd, unsigned long arg)
*(adv->instance) = group_tries; *(adv->instance) = group_tries;
} }
/* driver wants a permanent copy of the node name, so make one here */ objname = meta->o_name; //no need for a copy, meta->o_name will never be freed or changed
objname = strdup(meta->o_name);
if (objname == nullptr) {
return -ENOMEM;
}
/* driver wants a permanent copy of the path, so make one here */ /* driver wants a permanent copy of the path, so make one here */
devpath = strdup(nodepath); devpath = strdup(nodepath);
if (devpath == nullptr) { if (devpath == nullptr) {
free((void *)objname);
return -ENOMEM; return -ENOMEM;
} }
@@ -693,7 +687,6 @@ uORB::DeviceMaster::ioctl(struct file *filp, int cmd, unsigned long arg)
/* if we didn't get a device, that's bad */ /* if we didn't get a device, that's bad */
if (node == nullptr) { if (node == nullptr) {
free((void *)objname);
free((void *)devpath); free((void *)devpath);
return -ENOMEM; return -ENOMEM;
} }
@@ -720,7 +713,6 @@ uORB::DeviceMaster::ioctl(struct file *filp, int cmd, unsigned long arg)
} }
/* also discard the name now */ /* also discard the name now */
free((void *)objname);
free((void *)devpath); free((void *)devpath);
} else { } else {
src/modules/uORB/uORBDevices_posix.cpp
+1 -9
View File
@@ -679,18 +679,12 @@ uORB::DeviceMaster::ioctl(device::file_t *filp, int cmd, unsigned long arg)
*(adv->instance) = group_tries; *(adv->instance) = group_tries;
} }
/* driver wants a permanent copy of the node name, so make one here */ objname = meta->o_name; //no need for a copy, meta->o_name will never be freed or changed
objname = strdup(meta->o_name);
if (objname == nullptr) {
return -ENOMEM;
}
/* driver wants a permanent copy of the path, so make one here */ /* driver wants a permanent copy of the path, so make one here */
devpath = strdup(nodepath); devpath = strdup(nodepath);
if (devpath == nullptr) { if (devpath == nullptr) {
free((void *)objname);
return -ENOMEM; return -ENOMEM;
} }
@@ -699,7 +693,6 @@ uORB::DeviceMaster::ioctl(device::file_t *filp, int cmd, unsigned long arg)
/* if we didn't get a device, that's bad */ /* if we didn't get a device, that's bad */
if (node == nullptr) { if (node == nullptr) {
free((void *)objname);
free((void *)devpath); free((void *)devpath);
return -ENOMEM; return -ENOMEM;
} }
@@ -726,7 +719,6 @@ uORB::DeviceMaster::ioctl(device::file_t *filp, int cmd, unsigned long arg)
} }
/* also discard the name now */ /* also discard the name now */
free((void *)objname);
free((void *)devpath); free((void *)devpath);
} else { } else {