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

Package Kit: Rename InstallationLocationInfo::OldState to ActiveState.

Browse Source 
It doesn't refer to some random old state, but the currently active
one. (If the currently active state is the default one, then it will
return nothing.) So, this should make things clearer.

Change-Id: Ib3fe842f5fb51eaf2ef2f31bad8b292b47a3fb36
Reviewed-on: https://review.haiku-os.org/c/haiku/+/10403
Tested-by: Commit checker robot <[email protected]>
Reviewed-by: waddlesplash <[email protected]>
This commit is contained in:
Augustin Cavalier
2026-03-03 22:14:57 +00:00
committed by waddlesplash
parent 1b43451034
commit 79ab5081b2
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/package/InstallationLocationInfo.h
+3 -3
View File
@@ -45,8 +45,8 @@ public:
void SetCurrentlyActivePackageInfos( void SetCurrentlyActivePackageInfos(
const BPackageInfoSet& infos); const BPackageInfoSet& infos);
const BString& OldStateName() const; const BString& ActiveStateName() const;
void SetOldStateName(const BString& name); void SetActiveStateName(const BString& name);
int64 ChangeCount() const; int64 ChangeCount() const;
void SetChangeCount(int64 changeCount); void SetChangeCount(int64 changeCount);
@@ -58,7 +58,7 @@ private:
BPackageInfoSet fLatestActivePackageInfos; BPackageInfoSet fLatestActivePackageInfos;
BPackageInfoSet fLatestInactivePackageInfos; BPackageInfoSet fLatestInactivePackageInfos;
BPackageInfoSet fCurrentlyActivePackageInfos; BPackageInfoSet fCurrentlyActivePackageInfos;
BString fOldStateName; BString fActiveStateName;
int64 fChangeCount; int64 fChangeCount;
}; };
src/kits/package/DaemonClient.cpp
+3 -3
View File
@@ -100,8 +100,8 @@ BDaemonClient::GetInstallationLocationInfo(
if (error != B_OK && error != B_NAME_NOT_FOUND) if (error != B_OK && error != B_NAME_NOT_FOUND)
return error; return error;
BString oldStateName; BString activeStateName;
error = reply.FindString("old state", &oldStateName); error = reply.FindString("active state", &activeStateName);
if (error != B_OK && error != B_NAME_NOT_FOUND) if (error != B_OK && error != B_NAME_NOT_FOUND)
return error; return error;
@@ -113,7 +113,7 @@ BDaemonClient::GetInstallationLocationInfo(
_info.SetLatestActivePackageInfos(latestActivePackages); _info.SetLatestActivePackageInfos(latestActivePackages);
_info.SetLatestInactivePackageInfos(latestInactivePackages); _info.SetLatestInactivePackageInfos(latestInactivePackages);
_info.SetCurrentlyActivePackageInfos(currentlyActivePackages); _info.SetCurrentlyActivePackageInfos(currentlyActivePackages);
_info.SetOldStateName(oldStateName); _info.SetActiveStateName(activeStateName);
_info.SetChangeCount(changeCount); _info.SetChangeCount(changeCount);
return B_OK; return B_OK;
src/kits/package/InstallationLocationInfo.cpp
+6 -6
View File
@@ -21,7 +21,7 @@ BInstallationLocationInfo::BInstallationLocationInfo()
fLatestActivePackageInfos(), fLatestActivePackageInfos(),
fLatestInactivePackageInfos(), fLatestInactivePackageInfos(),
fCurrentlyActivePackageInfos(), fCurrentlyActivePackageInfos(),
fOldStateName(), fActiveStateName(),
fChangeCount(0) fChangeCount(0)
{ {
} }
@@ -41,7 +41,7 @@ BInstallationLocationInfo::Unset()
fLatestActivePackageInfos.MakeEmpty(); fLatestActivePackageInfos.MakeEmpty();
fLatestInactivePackageInfos.MakeEmpty(); fLatestInactivePackageInfos.MakeEmpty();
fCurrentlyActivePackageInfos.MakeEmpty(); fCurrentlyActivePackageInfos.MakeEmpty();
fOldStateName.Truncate(0); fActiveStateName.Truncate(0);
fChangeCount = 0; fChangeCount = 0;
} }
@@ -136,16 +136,16 @@ BInstallationLocationInfo::SetCurrentlyActivePackageInfos(
const BString& const BString&
BInstallationLocationInfo::OldStateName() const BInstallationLocationInfo::ActiveStateName() const
{ {
return fOldStateName; return fActiveStateName;
} }
void void
BInstallationLocationInfo::SetOldStateName(const BString& name) BInstallationLocationInfo::SetActiveStateName(const BString& name)
{ {
fOldStateName = name; fActiveStateName = name;
} }
src/servers/package/Volume.cpp
+1 -1
View File
@@ -558,7 +558,7 @@ Volume::HandleGetLocationInfoRequest(BMessage* message)
if (fActiveState != fLatestState) { if (fActiveState != fLatestState) {
if (fPackagesDirectoryCount > 1) { if (fPackagesDirectoryCount > 1) {
fLocationInfoReply.AddString("old state", fLocationInfoReply.AddString("active state",
fPackagesDirectories[fPackagesDirectoryCount - 1].Name()); fPackagesDirectories[fPackagesDirectoryCount - 1].Name());
} }