Renamed KDiskDeviceManager::DiskSystemWith{ID,Name}() to FindDiskSystem().
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@3903 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
parent
995d5c53be
commit
7dd03a026b
@ -506,9 +506,9 @@ KDiskDeviceManager::JobQueueAt(int32 index)
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
// DiskSystemWithName
|
// FindDiskSystem
|
||||||
KDiskSystem *
|
KDiskSystem *
|
||||||
KDiskDeviceManager::DiskSystemWithName(const char *name)
|
KDiskDeviceManager::FindDiskSystem(const char *name)
|
||||||
{
|
{
|
||||||
for (int32 cookie = 0;
|
for (int32 cookie = 0;
|
||||||
KDiskSystem *diskSystem = NextDiskSystem(&cookie); ) {
|
KDiskSystem *diskSystem = NextDiskSystem(&cookie); ) {
|
||||||
@ -518,9 +518,9 @@ KDiskDeviceManager::DiskSystemWithName(const char *name)
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
// DiskSystemWithID
|
// FindDiskSystem
|
||||||
KDiskSystem *
|
KDiskSystem *
|
||||||
KDiskDeviceManager::DiskSystemWithID(disk_system_id id)
|
KDiskDeviceManager::FindDiskSystem(disk_system_id id)
|
||||||
{
|
{
|
||||||
DiskSystemMap::Iterator it = fDiskSystems->Find(id);
|
DiskSystemMap::Iterator it = fDiskSystems->Find(id);
|
||||||
if (it != fDiskSystems->End())
|
if (it != fDiskSystems->End())
|
||||||
@ -556,7 +556,7 @@ KDiskDeviceManager::LoadDiskSystem(disk_system_id id)
|
|||||||
{
|
{
|
||||||
KDiskSystem *diskSystem = NULL;
|
KDiskSystem *diskSystem = NULL;
|
||||||
if (ManagerLocker locker = this) {
|
if (ManagerLocker locker = this) {
|
||||||
diskSystem = DiskSystemWithID(id);
|
diskSystem = FindDiskSystem(id);
|
||||||
if (diskSystem && diskSystem->Load() != B_OK)
|
if (diskSystem && diskSystem->Load() != B_OK)
|
||||||
diskSystem = NULL;
|
diskSystem = NULL;
|
||||||
}
|
}
|
||||||
|
@ -184,7 +184,7 @@ find_disk_system(const char *name)
|
|||||||
{
|
{
|
||||||
KDiskDeviceManager *manager = KDiskDeviceManager::Default();
|
KDiskDeviceManager *manager = KDiskDeviceManager::Default();
|
||||||
if (ManagerLocker locker = manager) {
|
if (ManagerLocker locker = manager) {
|
||||||
if (KDiskSystem *diskSystem = manager->DiskSystemWithName(name))
|
if (KDiskSystem *diskSystem = manager->FindDiskSystem(name))
|
||||||
return diskSystem->ID();
|
return diskSystem->ID();
|
||||||
}
|
}
|
||||||
return -1;
|
return -1;
|
||||||
|
Loading…
Reference in New Issue
Block a user