Merge "lshal: use FQName::parse" (dabafa01) · Commits · e / os / android_frameworks_native-old

cmds/lshal/DebugCommand.cpp

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -59,8 +59,8 @@ Status DebugCommand::main(const Arg &arg) {

	auto pair = splitFirst(mInterfaceName, '/');		auto pair = splitFirst(mInterfaceName, '/');

	FQName fqName(pair.first);		FQName fqName;
	if (!fqName.isValid() \|\| fqName.isIdentifier() \|\| !fqName.isFullyQualified()) {		if (!FQName::parse(pair.first, &fqName) \|\| fqName.isIdentifier() \|\| !fqName.isFullyQualified()) {
	mLshal.err() << "Invalid fully-qualified name '" << pair.first << "'\n\n";		mLshal.err() << "Invalid fully-qualified name '" << pair.first << "'\n\n";
	return USAGE;		return USAGE;
	}		}

cmds/lshal/ListCommand.cpp

+9 −9

Original line number	Original line	Diff line number	Diff line
	@@ -252,16 +252,16 @@ void ListCommand::postprocess() {
	// use a double for loop here because lshal doesn't care about efficiency.		// use a double for loop here because lshal doesn't care about efficiency.
	for (TableEntry &packageEntry : mImplementationsTable) {		for (TableEntry &packageEntry : mImplementationsTable) {
	std::string packageName = packageEntry.interfaceName;		std::string packageName = packageEntry.interfaceName;
	FQName fqPackageName{packageName.substr(0, packageName.find("::"))};		FQName fqPackageName;
	if (!fqPackageName.isValid()) {		if (!FQName::parse(packageName.substr(0, packageName.find("::")), &fqPackageName)) {
	continue;		continue;
	}		}
	for (TableEntry &interfaceEntry : mPassthroughRefTable) {		for (TableEntry &interfaceEntry : mPassthroughRefTable) {
	if (interfaceEntry.arch != ARCH_UNKNOWN) {		if (interfaceEntry.arch != ARCH_UNKNOWN) {
	continue;		continue;
	}		}
	FQName interfaceName{splitFirst(interfaceEntry.interfaceName, '/').first};		FQName interfaceName;
	if (!interfaceName.isValid()) {		if (!FQName::parse(splitFirst(interfaceEntry.interfaceName, '/').first, &interfaceName)) {
	continue;		continue;
	}		}
	if (interfaceName.getPackageAndVersion() == fqPackageName) {		if (interfaceName.getPackageAndVersion() == fqPackageName) {
	@@ -308,10 +308,10 @@ void ListCommand::dumpVintf(const NullableOStream<std::ostream>& out) const {
	// Quick hack to work around *'s		// Quick hack to work around *'s
	replaceAll(&fqInstanceName, '*', 'D');		replaceAll(&fqInstanceName, '*', 'D');
	}		}
	auto splittedFqInstanceName = splitFirst(fqInstanceName, '/');		auto splitFqInstanceName = splitFirst(fqInstanceName, '/');
	FQName fqName(splittedFqInstanceName.first);		FQName fqName;
	if (!fqName.isValid()) {		if (!FQName::parse(splitFqInstanceName.first, &fqName)) {
	err() << "Warning: '" << splittedFqInstanceName.first		err() << "Warning: '" << splitFqInstanceName.first
	<< "' is not a valid FQName." << std::endl;		<< "' is not a valid FQName." << std::endl;
	continue;		continue;
	}		}
	@@ -335,7 +335,7 @@ void ListCommand::dumpVintf(const NullableOStream<std::ostream>& out) const {
	std::string interfaceName =		std::string interfaceName =
	&table == &mImplementationsTable ? "" : fqName.name();		&table == &mImplementationsTable ? "" : fqName.name();
	std::string instanceName =		std::string instanceName =
	&table == &mImplementationsTable ? "" : splittedFqInstanceName.second;		&table == &mImplementationsTable ? "" : splitFqInstanceName.second;

	vintf::Version version{fqName.getPackageMajorVersion(),		vintf::Version version{fqName.getPackageMajorVersion(),
	fqName.getPackageMinorVersion()};		fqName.getPackageMinorVersion()};