Merge "idmap2: move static functions to anonymous namespaces" (b9c1e748) · Commits · e / os / android_frameworks_base

cmds/idmap2/idmap2/Main.cpp

+5 −1

Original line number	Diff line number	Diff line
		@@ -32,7 +32,9 @@ using android::idmap2::CommandLineOptions;
		typedef std::map<std::string, std::function<int(const std::vector<std::string>&, std::ostream&)>>
		NameToFunctionMap;

		static void PrintUsage(const NameToFunctionMap& commands, std::ostream& out) {
		namespace {

		void PrintUsage(const NameToFunctionMap& commands, std::ostream& out) {
		out << "usage: idmap2 [";
		for (auto iter = commands.cbegin(); iter != commands.cend(); iter++) {
		if (iter != commands.cbegin()) {
		@@ -43,6 +45,8 @@ static void PrintUsage(const NameToFunctionMap& commands, std::ostream& out) {
		out << "]" << std::endl;
		}

		} // namespace

		int main(int argc, char** argv) {
		const NameToFunctionMap commands = {
		{"create", Create}, {"dump", Dump}, {"lookup", Lookup}, {"scan", Scan}, {"verify", Verify},

cmds/idmap2/libidmap2/Idmap.cpp

+9 −5

Original line number	Diff line number	Diff line
		@@ -39,6 +39,8 @@
		namespace android {
		namespace idmap2 {

		namespace {

		#define EXTRACT_TYPE(resid) ((0x00ff0000 & (resid)) >> 16)

		#define EXTRACT_ENTRY(resid) (0x0000ffff & (resid))
		@@ -56,7 +58,7 @@ struct MatchingResources {
		std::map<TypeId, std::set<std::pair<ResourceId, ResourceId>>> map;
		};

		static bool WARN_UNUSED Read16(std::istream& stream, uint16_t* out) {
		bool WARN_UNUSED Read16(std::istream& stream, uint16_t* out) {
		uint16_t value;
		if (stream.read(reinterpret_cast<char*>(&value), sizeof(uint16_t))) {
		*out = dtohl(value);
		@@ -65,7 +67,7 @@ static bool WARN_UNUSED Read16(std::istream& stream, uint16_t* out) {
		return false;
		}

		static bool WARN_UNUSED Read32(std::istream& stream, uint32_t* out) {
		bool WARN_UNUSED Read32(std::istream& stream, uint32_t* out) {
		uint32_t value;
		if (stream.read(reinterpret_cast<char*>(&value), sizeof(uint32_t))) {
		*out = dtohl(value);
		@@ -75,7 +77,7 @@ static bool WARN_UNUSED Read32(std::istream& stream, uint32_t* out) {
		}

		// a string is encoded as a kIdmapStringLength char array; the array is always null-terminated
		static bool WARN_UNUSED ReadString(std::istream& stream, char out[kIdmapStringLength]) {
		bool WARN_UNUSED ReadString(std::istream& stream, char out[kIdmapStringLength]) {
		char buf[kIdmapStringLength];
		memset(buf, 0, sizeof(buf));
		if (!stream.read(buf, sizeof(buf))) {
		@@ -88,7 +90,7 @@ static bool WARN_UNUSED ReadString(std::istream& stream, char out[kIdmapStringLe
		return true;
		}

		static ResourceId NameToResid(const AssetManager2& am, const std::string& name) {
		ResourceId NameToResid(const AssetManager2& am, const std::string& name) {
		return am.GetResourceId(name);
		}

		@@ -101,7 +103,7 @@ static ResourceId NameToResid(const AssetManager2& am, const std::string& name)
		// relying on a hard-coded index. This however requires storing the package name in the idmap
		// header, which in turn requires incrementing the idmap version. Because the initial version of
		// idmap2 is compatible with idmap, this will have to wait for now.
		static const LoadedPackage* GetPackageAtIndex0(const LoadedArsc& loaded_arsc) {
		const LoadedPackage* GetPackageAtIndex0(const LoadedArsc& loaded_arsc) {
		const std::vector<std::unique_ptr<const LoadedPackage>>& packages = loaded_arsc.GetPackages();
		if (packages.empty()) {
		return nullptr;
		@@ -110,6 +112,8 @@ static const LoadedPackage* GetPackageAtIndex0(const LoadedArsc& loaded_arsc) {
		return loaded_arsc.GetPackageById(id);
		}

		} // namespace

		std::unique_ptr<const IdmapHeader> IdmapHeader::FromBinaryStream(std::istream& stream) {
		std::unique_ptr<IdmapHeader> idmap_header(new IdmapHeader());

cmds/idmap2/tests/Idmap2BinaryTests.cpp

+6 −2

Original line number	Diff line number	Diff line
		@@ -51,7 +51,9 @@ namespace idmap2 {

		class Idmap2BinaryTests : public Idmap2Tests {};

		static void AssertIdmap(const Idmap& idmap, const std::string& target_apk_path,
		namespace {

		void AssertIdmap(const Idmap& idmap, const std::string& target_apk_path,
		const std::string& overlay_apk_path) {
		// check that the idmap file looks reasonable (IdmapTests is responsible for
		// more in-depth verification)
		@@ -67,6 +69,8 @@ static void AssertIdmap(const Idmap& idmap, const std::string& target_apk_path,
		ASSERT_NO_FATAL_FAILURE(AssertIdmap(idmap_ref, target_apk_path, overlay_apk_path)); \
		} while (0)

		} // namespace

		TEST_F(Idmap2BinaryTests, Create) {
		// clang-format off
		auto result = ExecuteBinary({"idmap2",