Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup following up on r40466:

Browse Source 
* remove commented methods no longer being used


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40471 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Oliver Tappe 2011-02-12 22:09:47 +00:00
parent a9bc82a4b0
commit 05b101b223
2 changed files with 0 additions and 314 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
headers/private/package/hpkg/PackageReaderImpl.h
View File

@ -103,20 +103,6 @@ private:
status_t _ParseAttributeTree(
AttributeHandlerContext* context);
status_t _ParsePackageAttributes(
AttributeHandlerContext* context);
status_t _ParsePackageVersion(
BPackageVersionData& _version,
const char* major = NULL);
status_t _ParsePackageProvides(
BPackageResolvableData& _resolvable,
BPackageResolvableType providesType);
status_t _ParsePackageResolvableExpression(
BPackageResolvableExpressionData&
_resolvableExpression,
const char* resolvableName,
bool hasChildren);
status_t _ReadAttribute(uint8& _id,
AttributeValue& _value,
bool* _hasChildren = NULL,

300
src/kits/package/hpkg/PackageReaderImpl.cpp
View File

@ -1284,306 +1284,6 @@ PackageReaderImpl::_ParseAttributeTree(AttributeHandlerContext* context)
}
status_t
PackageReaderImpl::_ParsePackageAttributes(AttributeHandlerContext* context)
{
//
// if (tag == 0) {
// return
// context->packageContentHandler->HandlePackageAttributesDone();
// }
//
// switch (id) {
// case B_HPKG_ATTRIBUTE_ID_PACKAGE_NAME:
// handlerValue.SetTo(B_PACKAGE_INFO_NAME, attributeValue.string);
// break;
//
// case B_HPKG_ATTRIBUTE_ID_PACKAGE_SUMMARY:
// handlerValue.SetTo(B_PACKAGE_INFO_SUMMARY,
// attributeValue.string);
// break;
//
// case B_HPKG_ATTRIBUTE_ID_PACKAGE_DESCRIPTION:
// handlerValue.SetTo(B_PACKAGE_INFO_DESCRIPTION,
// attributeValue.string);
// break;
//
// case B_HPKG_ATTRIBUTE_ID_PACKAGE_VENDOR:
// handlerValue.SetTo(B_PACKAGE_INFO_VENDOR,
// attributeValue.string);
// break;
//
// case B_HPKG_ATTRIBUTE_ID_PACKAGE_PACKAGER:
// handlerValue.SetTo(B_PACKAGE_INFO_PACKAGER,
// attributeValue.string);
// break;
//
// case B_HPKG_ATTRIBUTE_ID_PACKAGE_FLAGS:
// handlerValue.SetTo(B_PACKAGE_INFO_FLAGS,
// (uint32)attributeValue.unsignedInt);
// break;
//
// case B_HPKG_ATTRIBUTE_ID_PACKAGE_ARCHITECTURE:
// if (attributeValue.unsignedInt
// >= B_PACKAGE_ARCHITECTURE_ENUM_COUNT) {
// fErrorOutput->PrintError(
// "Error: Invalid package attribute section: "
// "Invalid package architecture %lld encountered\n",
// attributeValue.unsignedInt);
// return B_BAD_DATA;
// }
// handlerValue.SetTo(B_PACKAGE_INFO_ARCHITECTURE,
// (uint8)attributeValue.unsignedInt);
// break;
//
// case B_HPKG_ATTRIBUTE_ID_PACKAGE_VERSION_MAJOR:
// error = _ParsePackageVersion(handlerValue.version,
// attributeValue.string);
// if (error != B_OK)
// return error;
// handlerValue.attributeID = B_PACKAGE_INFO_VERSION;
// break;
//
// case B_HPKG_ATTRIBUTE_ID_PACKAGE_COPYRIGHT:
// handlerValue.SetTo(B_PACKAGE_INFO_COPYRIGHTS,
// attributeValue.string);
// break;
//
// case B_HPKG_ATTRIBUTE_ID_PACKAGE_LICENSE:
// handlerValue.SetTo(B_PACKAGE_INFO_LICENSES,
// attributeValue.string);
// break;
//
// case B_HPKG_ATTRIBUTE_ID_PACKAGE_PROVIDES_TYPE:
// error = _ParsePackageProvides(handlerValue.resolvable,
// (BPackageResolvableType)attributeValue.unsignedInt);
// if (error != B_OK)
// return error;
// handlerValue.attributeID = B_PACKAGE_INFO_PROVIDES;
// break;
//
// case B_HPKG_ATTRIBUTE_ID_PACKAGE_REQUIRES:
// error = _ParsePackageResolvableExpression(
// handlerValue.resolvableExpression, attributeValue.string,
// hasChildren);
// if (error != B_OK)
// return error;
// handlerValue.attributeID = B_PACKAGE_INFO_REQUIRES;
// break;
//
// case B_HPKG_ATTRIBUTE_ID_PACKAGE_SUPPLEMENTS:
// error = _ParsePackageResolvableExpression(
// handlerValue.resolvableExpression, attributeValue.string,
// hasChildren);
// if (error != B_OK)
// return error;
// handlerValue.attributeID = B_PACKAGE_INFO_SUPPLEMENTS;
// break;
//
// case B_HPKG_ATTRIBUTE_ID_PACKAGE_CONFLICTS:
// error = _ParsePackageResolvableExpression(
// handlerValue.resolvableExpression, attributeValue.string,
// hasChildren);
// if (error != B_OK)
// return error;
// handlerValue.attributeID = B_PACKAGE_INFO_CONFLICTS;
// break;
//
// case B_HPKG_ATTRIBUTE_ID_PACKAGE_FRESHENS:
// error = _ParsePackageResolvableExpression(
// handlerValue.resolvableExpression, attributeValue.string,
// hasChildren);
// if (error != B_OK)
// return error;
// handlerValue.attributeID = B_PACKAGE_INFO_FRESHENS;
// break;
//
// case B_HPKG_ATTRIBUTE_ID_PACKAGE_REPLACES:
// handlerValue.SetTo(B_PACKAGE_INFO_REPLACES,
// attributeValue.string);
// break;
//
// default:
// fErrorOutput->PrintError(
// "Error: Invalid package attribute section: unexpected "
// "package attribute id %d encountered\n", id);
// return B_BAD_DATA;
// }
//
// error = context->packageContentHandler->HandlePackageAttribute(
// handlerValue);
// if (error != B_OK)
// return error;
// }
return B_OK;
}
status_t
PackageReaderImpl::_ParsePackageVersion(BPackageVersionData& _version,
const char* major)
{
// uint8 id;
// AttributeValue value;
// status_t error;
//
// _version.major = NULL;
// _version.minor = NULL;
// _version.micro = NULL;
// _version.release = 0;
//
// // major (may have been read already)
// if (major == NULL) {
// error = _ReadPackageAttribute(id, value);
// if (error != B_OK)
// return error;
// if (id != B_HPKG_ATTRIBUTE_ID_PACKAGE_VERSION_MAJOR) {
// fErrorOutput->PrintError("Error: Invalid package attribute section:"
// " Invalid package version, expected major\n");
// return B_BAD_DATA;
// }
// major = value.string;
// }
// _version.major = major;
//
// // minor
// error = _ReadPackageAttribute(id, value);
// if (error != B_OK)
// return error;
// if (id != B_HPKG_ATTRIBUTE_ID_PACKAGE_VERSION_MINOR) {
// fErrorOutput->PrintError("Error: Invalid package attribute section:"
// " Invalid package version, expected minor\n");
// return B_BAD_DATA;
// }
// _version.minor = value.string;
//
// // micro
// error = _ReadPackageAttribute(id, value);
// if (error != B_OK)
// return error;
// if (id != B_HPKG_ATTRIBUTE_ID_PACKAGE_VERSION_MICRO) {
// fErrorOutput->PrintError("Error: Invalid package attribute section:"
// " Invalid package version, expected micro\n");
// return B_BAD_DATA;
// }
// _version.micro = value.string;
//
// // release
// error = _ReadPackageAttribute(id, value);
// if (error != B_OK)
// return error;
// if (id != B_HPKG_ATTRIBUTE_ID_PACKAGE_VERSION_RELEASE) {
// fErrorOutput->PrintError("Error: Invalid package attribute section:"
// " Invalid package version, expected release\n");
// return B_BAD_DATA;
// }
// _version.release = (uint8)value.unsignedInt;
//
return B_OK;
}
status_t
PackageReaderImpl::_ParsePackageProvides(BPackageResolvableData& _resolvable,
BPackageResolvableType providesType)
{
// uint8 id;
// AttributeValue value;
// bool hasChildren;
//
// if (providesType >= B_PACKAGE_RESOLVABLE_TYPE_ENUM_COUNT) {
// fErrorOutput->PrintError("Error: Invalid package attribute section: "
// "Invalid package provides type %lld encountered\n", providesType);
// return B_BAD_DATA;
// }
// _resolvable.type = providesType;
// _resolvable.haveVersion = false;
//
// // provides name
// status_t error = _ReadPackageAttribute(id, value, &hasChildren);
// if (error != B_OK)
// return error;
// if (id != B_HPKG_ATTRIBUTE_ID_PACKAGE_PROVIDES) {
// fErrorOutput->PrintError("Error: Invalid package attribute section: "
// "Invalid package provides, expected name of resolvable\n");
// return B_BAD_DATA;
// }
// _resolvable.name = value.string;
//
// // there may be a version added as child
// if (hasChildren) {
// error = _ParsePackageVersion(_resolvable.version);
// if (error != B_OK)
// return error;
//
// _resolvable.haveVersion = true;
//
// uint64 tag;
// if ((error = _ReadUnsignedLEB128(tag)) != B_OK)
// return error;
// if (tag != 0) {
// fErrorOutput->PrintError("Error: Invalid package attribute "
// "section: Invalid package provides, expected end-tag\n");
// return B_BAD_DATA;
// }
// }
return B_OK;
}
status_t
PackageReaderImpl::_ParsePackageResolvableExpression(
BPackageResolvableExpressionData& _resolvableExpression,
const char* resolvableName, bool hasChildren)
{
// _resolvableExpression.name = resolvableName;
// _resolvableExpression.haveOpAndVersion = false;
//
// // there may be an operator and a version added as child
// if (hasChildren) {
// // resolvable-expression operator
// uint8 id;
// AttributeValue value;
// status_t error = _ReadPackageAttribute(id, value);
// if (error != B_OK)
// return error;
// if (id != B_HPKG_ATTRIBUTE_ID_PACKAGE_RESOLVABLE_OPERATOR) {
// fErrorOutput->PrintError("Error: Invalid package attribute section:"
// " Invalid package resolvable expression, expected operator\n");
// return B_BAD_DATA;
// }
//
// if (value.unsignedInt >= B_PACKAGE_RESOLVABLE_OP_ENUM_COUNT) {
// fErrorOutput->PrintError("Error: Invalid package attribute section:"
// " Invalid package resolvable operator %lld encountered\n",
// value.unsignedInt);
// return B_BAD_DATA;
// }
//
// _resolvableExpression.op
// = (BPackageResolvableOperator)value.unsignedInt;
//
// error = _ParsePackageVersion(_resolvableExpression.version);
// if (error != B_OK)
// return error;
//
// _resolvableExpression.haveOpAndVersion = true;
//
// uint64 tag;
// if ((error = _ReadUnsignedLEB128(tag)) != B_OK)
// return error;
// if (tag != 0) {
// fErrorOutput->PrintError("Error: Invalid package attribute section:"
// " Invalid package resolvable expression, expected end-tag\n");
// return B_BAD_DATA;
// }
// }
return B_OK;
}
status_t
PackageReaderImpl::_ReadAttribute(uint8& _id, AttributeValue& _value,
bool* _hasChildren, uint64* _tag)