fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-15 02:03:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Coverity CID 1268184..1268189

Browse Source
This commit is contained in:
Pavel Kirienko
2015-02-05 02:35:25 +03:00
parent 035a607944
commit b9f802026e
2 changed files with 33 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan_drivers/linux/apps/uavcan_nodetool.cpp
+15 -7
View File
@@ -348,14 +348,22 @@ void runForever(const uavcan_linux::NodePtr& node)
int main(int argc, const char** argv)
{
if (argc < 3)
try
{
std::cout << "Usage:\n\t" << argv[0] << " <node-id> <can-iface-name-1> [can-iface-name-N...]" << std::endl;
if (argc < 3)
{
std::cout << "Usage:\n\t" << argv[0] << " <node-id> <can-iface-name-1> [can-iface-name-N...]" << std::endl;
return 1;
}
const int self_node_id = std::stoi(argv[1]);
const std::vector<std::string> iface_names(argv + 2, argv + argc);
uavcan_linux::NodePtr node = initNode(iface_names, self_node_id, "org.uavcan.linux_nodetool");
runForever(node);
return 0;
}
catch (const std::exception& ex)
{
std::cerr << "Error: " << ex.what() << std::endl;
return 1;
}
const int self_node_id = std::stoi(argv[1]);
const std::vector<std::string> iface_names(argv + 2, argv + argc);
uavcan_linux::NodePtr node = initNode(iface_names, self_node_id, "org.uavcan.linux_nodetool");
runForever(node);
return 0;
}
libuavcan_drivers/linux/apps/uavcan_status_monitor.cpp
+18 -10
View File
@@ -127,17 +127,25 @@ static void runForever(const uavcan_linux::NodePtr& node)
int main(int argc, const char** argv)
{
if (argc < 2)
try
{
std::cout << "Usage:\n\t" << argv[0] << " <can-iface-name-1> [can-iface-name-N...]" << std::endl;
if (argc < 2)
{
std::cout << "Usage:\n\t" << argv[0] << " <can-iface-name-1> [can-iface-name-N...]" << std::endl;
return 1;
}
std::vector<std::string> iface_names;
for (int i = 1; i < argc; i++)
{
iface_names.emplace_back(argv[i]);
}
uavcan_linux::NodePtr node = initNodeInPassiveMode(iface_names, "org.uavcan.status_monitor");
runForever(node);
return 0;
}
catch (const std::exception& ex)
{
std::cerr << "Error: " << ex.what() << std::endl;
return 1;
}
std::vector<std::string> iface_names;
for (int i = 1; i < argc; i++)
{
iface_names.emplace_back(argv[i]);
}
uavcan_linux::NodePtr node = initNodeInPassiveMode(iface_names, "org.uavcan.status_monitor");
runForever(node);
return 0;
}