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

Minor API cleanup in GDTR: regist() --> registerDataType()

Browse Source
This commit is contained in:
Pavel Kirienko
2015-03-16 20:01:39 +03:00
parent 7ecd0a4259
commit 670e8bda51
3 changed files with 46 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/src/node/uc_global_data_type_registry.cpp
+12 -12
View File
@@ -27,22 +27,22 @@ GlobalDataTypeRegistry::List* GlobalDataTypeRegistry::selectList(DataTypeKind ki
}
}
GlobalDataTypeRegistry::RegistResult GlobalDataTypeRegistry::remove(Entry* dtd)
GlobalDataTypeRegistry::RegistrationResult GlobalDataTypeRegistry::remove(Entry* dtd)
{
if (!dtd)
{
UAVCAN_ASSERT(0);
return RegistResultInvalidParams;
return RegistrationResultInvalidParams;
}
if (isFrozen())
{
return RegistResultFrozen;
return RegistrationResultFrozen;
}
List* list = selectList(dtd->descriptor.getKind());
if (!list)
{
return RegistResultInvalidParams;
return RegistrationResultInvalidParams;
}
list->remove(dtd); // If this call came from regist<>(), that would be enough
@@ -56,25 +56,25 @@ GlobalDataTypeRegistry::RegistResult GlobalDataTypeRegistry::remove(Entry* dtd)
}
p = next;
}
return RegistResultOk;
return RegistrationResultOk;
}
GlobalDataTypeRegistry::RegistResult GlobalDataTypeRegistry::registImpl(Entry* dtd)
GlobalDataTypeRegistry::RegistrationResult GlobalDataTypeRegistry::registImpl(Entry* dtd)
{
if (!dtd || (dtd->descriptor.getID() > DataTypeID::Max))
{
UAVCAN_ASSERT(0);
return RegistResultInvalidParams;
return RegistrationResultInvalidParams;
}
if (isFrozen())
{
return RegistResultFrozen;
return RegistrationResultFrozen;
}
List* list = selectList(dtd->descriptor.getKind());
if (!list)
{
return RegistResultInvalidParams;
return RegistrationResultInvalidParams;
}
{ // Collision check
@@ -83,12 +83,12 @@ GlobalDataTypeRegistry::RegistResult GlobalDataTypeRegistry::registImpl(Entry* d
{
if (p->descriptor.getID() == dtd->descriptor.getID()) // ID collision
{
return RegistResultCollision;
return RegistrationResultCollision;
}
if (!std::strncmp(p->descriptor.getFullName(), dtd->descriptor.getFullName(),
DataTypeDescriptor::MaxFullNameLen)) // Name collision
{
return RegistResultCollision;
return RegistrationResultCollision;
}
p = p->getNextListNode();
}
@@ -122,7 +122,7 @@ GlobalDataTypeRegistry::RegistResult GlobalDataTypeRegistry::registImpl(Entry* d
}
}
#endif
return RegistResultOk;
return RegistrationResultOk;
}
GlobalDataTypeRegistry& GlobalDataTypeRegistry::instance()