diff options
| -rw-r--r-- | cmds/lshal/ListCommand.cpp | 13 | ||||
| -rw-r--r-- | libs/vr/libpdx_uds/service_endpoint.cpp | 7 |
2 files changed, 11 insertions, 9 deletions
diff --git a/cmds/lshal/ListCommand.cpp b/cmds/lshal/ListCommand.cpp index b9e0139a60..39fddc5a33 100644 --- a/cmds/lshal/ListCommand.cpp +++ b/cmds/lshal/ListCommand.cpp @@ -280,7 +280,8 @@ void ListCommand::postprocess() { "The Clients / Clients CMD column shows all process that have ever dlopen'ed \n" "the library and successfully fetched the passthrough implementation."); mImplementationsTable.setDescription( - "All available passthrough implementations (all -impl.so files)"); + "All available passthrough implementations (all -impl.so files).\n" + "These may return subclasses through their respective HIDL_FETCH_I* functions."); } static inline bool findAndBumpVersion(vintf::ManifestHal* hal, const vintf::Version& version) { @@ -394,11 +395,11 @@ void ListCommand::dumpVintf(const NullableOStream<std::ostream>& out) const { interfaces[interfaceName].instances.insert(instanceName); } if (!manifest.add(vintf::ManifestHal{ - .format = vintf::HalFormat::HIDL, - .name = fqName.package(), - .versions = {version}, - .transportArch = {transport, arch}, - .interfaces = interfaces})) { + vintf::HalFormat::HIDL, + std::string{fqName.package()}, + {version}, + {transport, arch}, + std::move(interfaces)})) { err() << "Warning: cannot add hal '" << fqInstanceName << "'" << std::endl; } } diff --git a/libs/vr/libpdx_uds/service_endpoint.cpp b/libs/vr/libpdx_uds/service_endpoint.cpp index 0ee77f43a6..32d40e8371 100644 --- a/libs/vr/libpdx_uds/service_endpoint.cpp +++ b/libs/vr/libpdx_uds/service_endpoint.cpp @@ -594,9 +594,10 @@ Status<void> Endpoint::MessageReceive(Message* message) { if (socket_fd_ && event.data.fd == socket_fd_.Get()) { auto status = AcceptConnection(message); - if (!status) - return status; - return ReenableEpollEvent(socket_fd_.Borrow()); + auto reenable_status = ReenableEpollEvent(socket_fd_.Borrow()); + if (!reenable_status) + return reenable_status; + return status; } BorrowedHandle channel_fd{event.data.fd}; |