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

BDaemonClient: Handle options message fields correctly

Browse Source
This commit is contained in:
Ingo Weinhold
2014-05-05 21:29:25 +02:00
parent c2f3b81d45
commit e9eb4df71b
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/package/DaemonClient.cpp
+11 -5
View File
@@ -63,11 +63,9 @@ BDaemonClient::GetInstallationLocationInfo(
int64 baseDirectoryNode; int64 baseDirectoryNode;
int32 packagesDirectoryDevice; int32 packagesDirectoryDevice;
int64 packagesDirectoryNode; int64 packagesDirectoryNode;
BString oldStateName;
int64 changeCount; int64 changeCount;
BPackageInfoSet latestActivePackages; BPackageInfoSet latestActivePackages;
BPackageInfoSet latestInactivePackages; BPackageInfoSet latestInactivePackages;
BPackageInfoSet currentlyActivePackages;
if ((error = reply.FindInt32("base directory device", &baseDirectoryDevice)) if ((error = reply.FindInt32("base directory device", &baseDirectoryDevice))
!= B_OK != B_OK
|| (error = reply.FindInt64("base directory node", &baseDirectoryNode)) || (error = reply.FindInt64("base directory node", &baseDirectoryNode))
@@ -80,13 +78,21 @@ BDaemonClient::GetInstallationLocationInfo(
latestActivePackages)) != B_OK latestActivePackages)) != B_OK
|| (error = _ExtractPackageInfoSet(reply, "latest inactive packages", || (error = _ExtractPackageInfoSet(reply, "latest inactive packages",
latestInactivePackages)) != B_OK latestInactivePackages)) != B_OK
|| (error = _ExtractPackageInfoSet(reply, "currently active packages",
currentlyActivePackages)) != B_OK
|| (error = reply.FindString("old state", &oldStateName)) != B_OK
|| (error = reply.FindInt64("change count", &changeCount)) != B_OK) { || (error = reply.FindInt64("change count", &changeCount)) != B_OK) {
return error; return error;
} }
BPackageInfoSet currentlyActivePackages;
error = _ExtractPackageInfoSet(reply, "currently active packages",
currentlyActivePackages);
if (error != B_OK && error != B_NAME_NOT_FOUND)
return error;
BString oldStateName;
error = reply.FindString("old state", &oldStateName);
if (error != B_OK && error != B_NAME_NOT_FOUND)
return error;
_info.Unset(); _info.Unset();
_info.SetLocation(location); _info.SetLocation(location);
_info.SetBaseDirectoryRef(node_ref(baseDirectoryDevice, baseDirectoryNode)); _info.SetBaseDirectoryRef(node_ref(baseDirectoryDevice, baseDirectoryNode));