From 941ec459132d16fe7a373841a054aa78063dbcd9 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 28 Jun 2011 01:04:26 +0200 Subject: [PATCH] Don't include architecture in package links names This reverts commit a491e591c86cec4b2ce52df86f7b0d32545b4169. --- .../file_systems/packagefs/PackageLinkDirectory.cpp | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/src/add-ons/kernel/file_systems/packagefs/PackageLinkDirectory.cpp b/src/add-ons/kernel/file_systems/packagefs/PackageLinkDirectory.cpp index 8b88e14eea..86fab0f19b 100644 --- a/src/add-ons/kernel/file_systems/packagefs/PackageLinkDirectory.cpp +++ b/src/add-ons/kernel/file_systems/packagefs/PackageLinkDirectory.cpp @@ -56,30 +56,17 @@ PackageLinkDirectory::Init(Directory* parent, Package* package) // + 1 for the '-' } - const char* architecture = package->ArchitectureName(); - if (architecture != NULL) { - size += 1 + strlen(architecture); - // + 1 for the '-' - } - // allocate the name and compose it char* name = (char*)malloc(size); if (name == NULL) return B_NO_MEMORY; memcpy(name, package->Name(), nameLength + 1); - if (version != NULL) { name[nameLength] = '-'; version->ToString(name + nameLength + 1, size - nameLength - 1); } - if (architecture != NULL) { - nameLength += strlen(name + nameLength); - name[nameLength] = '-'; - strlcpy(name + nameLength + 1, architecture, size - nameLength - 1); - } - // init the directory/node status_t error = Init(parent, name, NODE_FLAG_KEEP_NAME); if (error != B_OK)