From df29539688df25133e4f9decc5da7b1045dc1850 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 13 May 2013 17:43:31 +0200 Subject: [PATCH] Remove resolvable provides type * Remove BPackageResolvableType and respective property from BPackageResolvable. * Remove package attribute B_HPKG_ATTRIBUTE_ID_PACKAGE_PROVIDES_TYPE. --- headers/os/package/PackageResolvable.h | 10 ----- headers/os/package/PackageResolvableType.h | 26 ------------- headers/os/package/hpkg/HPKGDefs.h | 25 ++++++------- .../package/hpkg/PackageInfoAttributeValue.h | 2 - src/kits/package/PackageInfo.cpp | 37 +------------------ src/kits/package/PackageResolvable.cpp | 29 ++------------- .../package/hpkg/PackageContentHandler.cpp | 1 - src/kits/package/hpkg/ReaderImplBase.cpp | 5 --- src/kits/package/hpkg/WriterImplBase.cpp | 6 --- src/kits/package/hpkg/v1/ReaderImplBaseV1.cpp | 3 +- 10 files changed, 18 insertions(+), 126 deletions(-) delete mode 100644 headers/os/package/PackageResolvableType.h diff --git a/headers/os/package/PackageResolvable.h b/headers/os/package/PackageResolvable.h index e26daa4673..aad9f3e90c 100644 --- a/headers/os/package/PackageResolvable.h +++ b/headers/os/package/PackageResolvable.h @@ -8,7 +8,6 @@ #include -#include #include @@ -49,8 +48,6 @@ public: BPackageResolvable( const BPackageResolvableData& data); BPackageResolvable(const BString& name, - BPackageResolvableType type - = B_PACKAGE_RESOLVABLE_TYPE_DEFAULT, const BPackageVersion& version = BPackageVersion(), const BPackageVersion& compatibleVersion @@ -59,27 +56,20 @@ public: status_t InitCheck() const; const BString& Name() const; - BPackageResolvableType Type() const; const BPackageVersion& Version() const; const BPackageVersion& CompatibleVersion() const; BString ToString() const; void SetTo(const BString& name, - BPackageResolvableType type - = B_PACKAGE_RESOLVABLE_TYPE_DEFAULT, const BPackageVersion& version = BPackageVersion(), const BPackageVersion& compatibleVersion = BPackageVersion()); void Clear(); -public: - static const char* kTypeNames[]; - private: BString fName; - BPackageResolvableType fType; BPackageVersion fVersion; BPackageVersion fCompatibleVersion; }; diff --git a/headers/os/package/PackageResolvableType.h b/headers/os/package/PackageResolvableType.h deleted file mode 100644 index 7c72145dd2..0000000000 --- a/headers/os/package/PackageResolvableType.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright 2011, Haiku, Inc. - * Distributed under the terms of the MIT License. - */ -#ifndef _PACKAGE__PACKAGE_RESOLVABLE_TYPE_H_ -#define _PACKAGE__PACKAGE_RESOLVABLE_TYPE_H_ - - -namespace BPackageKit { - - -enum BPackageResolvableType { - B_PACKAGE_RESOLVABLE_TYPE_DEFAULT = 0, - B_PACKAGE_RESOLVABLE_TYPE_LIBRARY = 1, - B_PACKAGE_RESOLVABLE_TYPE_COMMAND = 2, - B_PACKAGE_RESOLVABLE_TYPE_APPLICATION = 3, - B_PACKAGE_RESOLVABLE_TYPE_ADD_ON = 4, - // - B_PACKAGE_RESOLVABLE_TYPE_ENUM_COUNT, -}; - - -} // namespace BPackageKit - - -#endif // _PACKAGE__PACKAGE_RESOLVABLE_TYPE_H_ diff --git a/headers/os/package/hpkg/HPKGDefs.h b/headers/os/package/hpkg/HPKGDefs.h index 551d4b09fd..cc955d67c4 100644 --- a/headers/os/package/hpkg/HPKGDefs.h +++ b/headers/os/package/hpkg/HPKGDefs.h @@ -116,19 +116,18 @@ enum BHPKGAttributeID { B_HPKG_ATTRIBUTE_ID_PACKAGE_COPYRIGHT = 29, B_HPKG_ATTRIBUTE_ID_PACKAGE_LICENSE = 30, B_HPKG_ATTRIBUTE_ID_PACKAGE_PROVIDES = 31, - B_HPKG_ATTRIBUTE_ID_PACKAGE_PROVIDES_TYPE = 32, - B_HPKG_ATTRIBUTE_ID_PACKAGE_REQUIRES = 33, - B_HPKG_ATTRIBUTE_ID_PACKAGE_SUPPLEMENTS = 34, - B_HPKG_ATTRIBUTE_ID_PACKAGE_CONFLICTS = 35, - B_HPKG_ATTRIBUTE_ID_PACKAGE_FRESHENS = 36, - B_HPKG_ATTRIBUTE_ID_PACKAGE_REPLACES = 37, - B_HPKG_ATTRIBUTE_ID_PACKAGE_RESOLVABLE_OPERATOR = 38, - B_HPKG_ATTRIBUTE_ID_PACKAGE_CHECKSUM = 39, - B_HPKG_ATTRIBUTE_ID_PACKAGE_VERSION_PRE_RELEASE = 40, - B_HPKG_ATTRIBUTE_ID_PACKAGE_PROVIDES_COMPATIBLE = 41, - B_HPKG_ATTRIBUTE_ID_PACKAGE_URL = 42, - B_HPKG_ATTRIBUTE_ID_PACKAGE_SOURCE_URL = 43, - B_HPKG_ATTRIBUTE_ID_PACKAGE_INSTALL_PATH = 44, + B_HPKG_ATTRIBUTE_ID_PACKAGE_REQUIRES = 32, + B_HPKG_ATTRIBUTE_ID_PACKAGE_SUPPLEMENTS = 33, + B_HPKG_ATTRIBUTE_ID_PACKAGE_CONFLICTS = 34, + B_HPKG_ATTRIBUTE_ID_PACKAGE_FRESHENS = 35, + B_HPKG_ATTRIBUTE_ID_PACKAGE_REPLACES = 36, + B_HPKG_ATTRIBUTE_ID_PACKAGE_RESOLVABLE_OPERATOR = 37, + B_HPKG_ATTRIBUTE_ID_PACKAGE_CHECKSUM = 38, + B_HPKG_ATTRIBUTE_ID_PACKAGE_VERSION_PRE_RELEASE = 39, + B_HPKG_ATTRIBUTE_ID_PACKAGE_PROVIDES_COMPATIBLE = 40, + B_HPKG_ATTRIBUTE_ID_PACKAGE_URL = 41, + B_HPKG_ATTRIBUTE_ID_PACKAGE_SOURCE_URL = 42, + B_HPKG_ATTRIBUTE_ID_PACKAGE_INSTALL_PATH = 43, // B_HPKG_ATTRIBUTE_ID_ENUM_COUNT, }; diff --git a/headers/os/package/hpkg/PackageInfoAttributeValue.h b/headers/os/package/hpkg/PackageInfoAttributeValue.h index 8cc785b6e7..7372612063 100644 --- a/headers/os/package/hpkg/PackageInfoAttributeValue.h +++ b/headers/os/package/hpkg/PackageInfoAttributeValue.h @@ -13,7 +13,6 @@ #include #include #include -#include namespace BPackageKit { @@ -31,7 +30,6 @@ struct BPackageVersionData { struct BPackageResolvableData { - BPackageResolvableType type; const char* name; bool haveVersion; bool haveCompatibleVersion; diff --git a/src/kits/package/PackageInfo.cpp b/src/kits/package/PackageInfo.cpp index e9075b1c2c..a27f691c1a 100644 --- a/src/kits/package/PackageInfo.cpp +++ b/src/kits/package/PackageInfo.cpp @@ -639,30 +639,6 @@ BPackageInfo::Parser::_ParseResolvableList( token.pos); } - BPackageResolvableType type = B_PACKAGE_RESOLVABLE_TYPE_DEFAULT; - int32 colonPos = token.text.FindFirst(':'); - if (colonPos >= 0) { - BString typeName(token.text, colonPos); - for (int i = 0; i < B_PACKAGE_RESOLVABLE_TYPE_ENUM_COUNT; ++i) { - if (typeName.ICompare(BPackageResolvable::kTypeNames[i]) - == 0) { - type = (BPackageResolvableType)i; - break; - } - } - if (type == B_PACKAGE_RESOLVABLE_TYPE_DEFAULT) { - BString error("resolvable type (:) must be one of ["); - for (int i = 1; i < B_PACKAGE_RESOLVABLE_TYPE_ENUM_COUNT; - ++i) { - if (i > 1) - error << ","; - error << BPackageResolvable::kTypeNames[i]; - } - error << "]"; - throw ParseError(error, token.pos); - } - } - int32 errorPos; if (!_IsValidResolvableName(token.text, &errorPos)) { throw ParseError("invalid character in resolvable name", @@ -694,7 +670,7 @@ BPackageInfo::Parser::_ParseResolvableList( } else parser._RewindTo(compatible); - value->AddItem(new BPackageResolvable(token.text, type, version, + value->AddItem(new BPackageResolvable(token.text, version, compatibleVersion)); } } resolvableParser(*this, value); @@ -2097,8 +2073,6 @@ BPackageInfo::_AddResolvables(BMessage* archive, const char* field, const BPackageResolvable* resolvable = resolvables.ItemAt(i); status_t error; if ((error = archive->AddString(nameField, resolvable->Name())) != B_OK - || (error = archive->AddInt32(typeField, resolvable->Type())) - != B_OK || (error = _AddVersion(archive, versionField, resolvable->Version())) != B_OK || (error = _AddVersion(archive, compatibleVersionField, @@ -2239,13 +2213,6 @@ BPackageInfo::_ExtractResolvables(BMessage* archive, const char* field, if (error != B_OK) return error; - int32 type; - error = archive->FindInt32(typeField, i, &type); - if (error != B_OK) - return error; - if (type < 0 || type > B_PACKAGE_RESOLVABLE_TYPE_ENUM_COUNT) - return B_BAD_DATA; - BPackageVersion version; error = _ExtractVersion(archive, versionField, i, version); if (error != B_OK) @@ -2258,7 +2225,7 @@ BPackageInfo::_ExtractResolvables(BMessage* archive, const char* field, return error; BPackageResolvable* resolvable = new(std::nothrow) BPackageResolvable( - name, (BPackageResolvableType)type, version, compatibleVersion); + name, version, compatibleVersion); if (resolvable == NULL || !_resolvables.AddItem(resolvable)) { delete resolvable; return B_NO_MEMORY; diff --git a/src/kits/package/PackageResolvable.cpp b/src/kits/package/PackageResolvable.cpp index 0c70c996ff..b604303b5f 100644 --- a/src/kits/package/PackageResolvable.cpp +++ b/src/kits/package/PackageResolvable.cpp @@ -12,19 +12,7 @@ namespace BPackageKit { -const char* -BPackageResolvable::kTypeNames[B_PACKAGE_RESOLVABLE_TYPE_ENUM_COUNT] = { - "", - "lib", - "cmd", - "app", - "add_on", -}; - - BPackageResolvable::BPackageResolvable() - : - fType(B_PACKAGE_RESOLVABLE_TYPE_DEFAULT) { } @@ -32,7 +20,6 @@ BPackageResolvable::BPackageResolvable() BPackageResolvable::BPackageResolvable(const BPackageResolvableData& data) : fName(data.name), - fType(data.type), fVersion(data.version), fCompatibleVersion(data.compatibleVersion) { @@ -40,11 +27,9 @@ BPackageResolvable::BPackageResolvable(const BPackageResolvableData& data) BPackageResolvable::BPackageResolvable(const BString& name, - BPackageResolvableType type, const BPackageVersion& version, - const BPackageVersion& compatibleVersion) + const BPackageVersion& version, const BPackageVersion& compatibleVersion) : fName(name), - fType(type), fVersion(version), fCompatibleVersion(compatibleVersion) { @@ -66,13 +51,6 @@ BPackageResolvable::Name() const } -BPackageResolvableType -BPackageResolvable::Type() const -{ - return fType; -} - - const BPackageVersion& BPackageResolvable::Version() const { @@ -104,11 +82,10 @@ BPackageResolvable::ToString() const void -BPackageResolvable::SetTo(const BString& name, BPackageResolvableType type, - const BPackageVersion& version, const BPackageVersion& compatibleVersion) +BPackageResolvable::SetTo(const BString& name, const BPackageVersion& version, + const BPackageVersion& compatibleVersion) { fName = name; - fType = type; fVersion = version; fCompatibleVersion = compatibleVersion; diff --git a/src/kits/package/hpkg/PackageContentHandler.cpp b/src/kits/package/hpkg/PackageContentHandler.cpp index c44f0b5e46..1a2a201253 100644 --- a/src/kits/package/hpkg/PackageContentHandler.cpp +++ b/src/kits/package/hpkg/PackageContentHandler.cpp @@ -48,7 +48,6 @@ static const char* kAttributeNames[B_HPKG_ATTRIBUTE_ID_ENUM_COUNT + 1] = { "package:copyright", "package:license", "package:provides", - "package:provides.type", "package:requires", "package:supplements", "package:conflicts", diff --git a/src/kits/package/hpkg/ReaderImplBase.cpp b/src/kits/package/hpkg/ReaderImplBase.cpp index 3346df1cf3..dd2e6d5602 100644 --- a/src/kits/package/hpkg/ReaderImplBase.cpp +++ b/src/kits/package/hpkg/ReaderImplBase.cpp @@ -185,11 +185,6 @@ ReaderImplBase::PackageResolvableAttributeHandler::HandleAttribute( AttributeHandler** _handler) { switch (id) { - case B_HPKG_ATTRIBUTE_ID_PACKAGE_PROVIDES_TYPE: - fPackageInfoValue.resolvable.type - = (BPackageResolvableType)value.unsignedInt; - break; - case B_HPKG_ATTRIBUTE_ID_PACKAGE_VERSION_MAJOR: fPackageInfoValue.resolvable.haveVersion = true; fPackageInfoValue.resolvable.version.major = value.string; diff --git a/src/kits/package/hpkg/WriterImplBase.cpp b/src/kits/package/hpkg/WriterImplBase.cpp index 94da235d01..df0469766d 100644 --- a/src/kits/package/hpkg/WriterImplBase.cpp +++ b/src/kits/package/hpkg/WriterImplBase.cpp @@ -472,12 +472,6 @@ WriterImplBase::RegisterPackageInfo(PackageAttributeList& attributeList, provides->string = fPackageStringCache.Get(resolvable->Name().String()); attributeList.Add(provides); - PackageAttribute* providesType = new PackageAttribute( - B_HPKG_ATTRIBUTE_ID_PACKAGE_PROVIDES_TYPE, - B_HPKG_ATTRIBUTE_TYPE_UINT, B_HPKG_ATTRIBUTE_ENCODING_INT_8_BIT); - providesType->unsignedInt = resolvable->Type(); - provides->children.Add(providesType); - if (hasVersion) RegisterPackageVersion(provides->children, resolvable->Version()); diff --git a/src/kits/package/hpkg/v1/ReaderImplBaseV1.cpp b/src/kits/package/hpkg/v1/ReaderImplBaseV1.cpp index d902e19b18..74bf776baa 100644 --- a/src/kits/package/hpkg/v1/ReaderImplBaseV1.cpp +++ b/src/kits/package/hpkg/v1/ReaderImplBaseV1.cpp @@ -191,8 +191,7 @@ ReaderImplBase::PackageResolvableAttributeHandler::HandleAttribute( { switch (id) { case B_HPKG_ATTRIBUTE_ID_PACKAGE_PROVIDES_TYPE: - fPackageInfoValue.resolvable.type - = (BPackageResolvableType)value.unsignedInt; + // obsolete break; case B_HPKG_ATTRIBUTE_ID_PACKAGE_VERSION_MAJOR: