i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BPackageInfo: Make use of BMessage::{Add,Find}Strings()

Browse Source
This commit is contained in:
Ingo Weinhold
2013-04-20 00:33:13 +02:00
parent cf0a957ff6
commit 7a27bcd113
2 changed files with 8 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/package/PackageInfo.h
-2
View File
@@ -174,8 +174,6 @@ private:
static status_t _AddVersion(BMessage* archive, static status_t _AddVersion(BMessage* archive,
const char* field, const char* field,
const BPackageVersion& version); const BPackageVersion& version);
static status_t _AddStringList(BMessage* archive,
const char* field, const BStringList& list);
static status_t _AddResolvables(BMessage* archive, static status_t _AddResolvables(BMessage* archive,
const char* field, const char* field,
const ResolvableList& resolvables); const ResolvableList& resolvables);
src/kits/package/PackageInfo.cpp
+8 -40
View File
@@ -1867,11 +1867,11 @@ BPackageInfo::Archive(BMessage* archive, bool deep) const
|| (error = archive->AddUInt32("flags", fFlags)) != B_OK || (error = archive->AddUInt32("flags", fFlags)) != B_OK
|| (error = archive->AddInt32("architecture", fArchitecture)) != B_OK || (error = archive->AddInt32("architecture", fArchitecture)) != B_OK
|| (error = _AddVersion(archive, "version", fVersion)) != B_OK || (error = _AddVersion(archive, "version", fVersion)) != B_OK
|| (error = _AddStringList(archive, "copyrights", fCopyrightList)) || (error = archive->AddStrings("copyrights", fCopyrightList))
!= B_OK != B_OK
|| (error = _AddStringList(archive, "licenses", fLicenseList)) != B_OK || (error = archive->AddStrings("licenses", fLicenseList)) != B_OK
|| (error = _AddStringList(archive, "urls", fURLList)) != B_OK || (error = archive->AddStrings("urls", fURLList)) != B_OK
|| (error = _AddStringList(archive, "source-urls", fSourceURLList)) || (error = archive->AddStrings("source-urls", fSourceURLList))
!= B_OK != B_OK
|| (error = _AddResolvables(archive, "provides", fProvidesList)) != B_OK || (error = _AddResolvables(archive, "provides", fProvidesList)) != B_OK
|| (error = _AddResolvableExpressions(archive, "requires", || (error = _AddResolvableExpressions(archive, "requires",
@@ -1882,7 +1882,7 @@ BPackageInfo::Archive(BMessage* archive, bool deep) const
fConflictsList)) != B_OK fConflictsList)) != B_OK
|| (error = _AddResolvableExpressions(archive, "freshens", || (error = _AddResolvableExpressions(archive, "freshens",
fFreshensList)) != B_OK fFreshensList)) != B_OK
|| (error = _AddStringList(archive, "replaces", fReplacesList)) != B_OK || (error = archive->AddStrings("replaces", fReplacesList)) != B_OK
|| (error = archive->AddString("checksum", fChecksum)) != B_OK || (error = archive->AddString("checksum", fChecksum)) != B_OK
|| (error = archive->AddString("install-path", fInstallPath)) != B_OK) { || (error = archive->AddString("install-path", fInstallPath)) != B_OK) {
return error; return error;
@@ -2010,21 +2010,6 @@ BPackageInfo::_AddVersion(BMessage* archive, const char* field,
} }
/*static*/ status_t
BPackageInfo::_AddStringList(BMessage* archive, const char* field,
const BStringList& list)
{
int32 count = list.CountStrings();
for (int32 i = 0; i < count; i++) {
status_t error = archive->AddString(field, list.StringAt(i));
if (error != B_OK)
return error;
}
return B_OK;
}
/*static*/ status_t /*static*/ status_t
BPackageInfo::_AddResolvables(BMessage* archive, const char* field, BPackageInfo::_AddResolvables(BMessage* archive, const char* field,
const ResolvableList& resolvables) const ResolvableList& resolvables)
@@ -2152,26 +2137,9 @@ BPackageInfo::_ExtractVersion(BMessage* archive, const char* field, int32 index,
BPackageInfo::_ExtractStringList(BMessage* archive, const char* field, BPackageInfo::_ExtractStringList(BMessage* archive, const char* field,
BStringList& _list) BStringList& _list)
{ {
// get the number of items status_t error = archive->FindStrings(field, &_list);
type_code type; return error == B_NAME_NOT_FOUND ? B_OK : error;
int32 count; // If the field doesn't exist, that's OK.
if (archive->GetInfo(field, &type, &count) != B_OK) {
// the field is missing
return B_OK;
}
if (type != B_STRING_TYPE)
return B_BAD_DATA;
for (int32 i = 0; i < count; i++) {
BString string;
status_t error = archive->FindString(field, i, &string);
if (error != B_OK)
return error;
if (!_list.Add(string))
return B_NO_MEMORY;
}
return B_OK;
} }