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

BPackageInfo::ReadFromConfigFile() BFile& version

Browse Source
This commit is contained in:
Ingo Weinhold 2011-07-01 01:37:48 +02:00
parent d046296e85
commit cd8f03a8cc
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
headers/os/package/PackageInfo.h
View File

@ -18,6 +18,7 @@
class BEntry; class BEntry;
class BFile;
namespace BPackageKit { namespace BPackageKit {
@ -44,6 +45,9 @@ public:
status_t ReadFromConfigFile( status_t ReadFromConfigFile(
const BEntry& packageInfoEntry, const BEntry& packageInfoEntry,
ParseErrorListener* listener = NULL); ParseErrorListener* listener = NULL);
status_t ReadFromConfigFile(
BFile& packageInfoFile,
ParseErrorListener* listener = NULL);
status_t ReadFromConfigString( status_t ReadFromConfigString(
const BString& packageInfoString, const BString& packageInfoString,
ParseErrorListener* listener = NULL); ParseErrorListener* listener = NULL);

13
src/kits/package/PackageInfo.cpp
View File

@ -849,8 +849,17 @@ BPackageInfo::ReadFromConfigFile(const BEntry& packageInfoEntry,
if ((result = file.InitCheck()) != B_OK) if ((result = file.InitCheck()) != B_OK)
return result; return result;
return ReadFromConfigFile(file, listener);
}
status_t
BPackageInfo::ReadFromConfigFile(BFile& packageInfoFile,
ParseErrorListener* listener)
{
off_t size; off_t size;
if ((result = file.GetSize(&size)) != B_OK) status_t result = packageInfoFile.GetSize(&size);
if (result != B_OK)
return result; return result;
BString packageInfoString; BString packageInfoString;
@ -858,7 +867,7 @@ BPackageInfo::ReadFromConfigFile(const BEntry& packageInfoEntry,
if (buffer == NULL) if (buffer == NULL)
return B_NO_MEMORY; return B_NO_MEMORY;
if ((result = file.Read(buffer, size)) < size) { if ((result = packageInfoFile.Read(buffer, size)) < size) {
packageInfoString.UnlockBuffer(0); packageInfoString.UnlockBuffer(0);
return result >= 0 ? B_IO_ERROR : result; return result >= 0 ? B_IO_ERROR : result;
} }