applications/calamares
3
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-02-24 19:05:46 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

[libcalamares] Use Logger::Pointer for logging void-pointers

Browse source
This commit is contained in:
Adriaan de Groot 2020-06-23 13:02:06 +02:00
parent 8a14316e16
commit 22fdca8f44
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libcalamares/partition/KPMManager.cpp
View file

@ -74,7 +74,7 @@ InternalManager::InternalManager()
else else
{ {
auto* backend_p = CoreBackendManager::self()->backend(); auto* backend_p = CoreBackendManager::self()->backend();
cDebug() << Logger::SubEntry << "Backend @" << (void*)backend_p << backend_p->id() << backend_p->version(); cDebug() << Logger::SubEntry << "Backend" << Logger::Pointer(backend_p) << backend_p->id() << backend_p->version();
s_kpm_loaded = true; s_kpm_loaded = true;
} }
} }

2
src/libcalamaresui/modulesystem/ModuleManager.cpp
View file

@ -344,7 +344,7 @@ ModuleManager::addModule( Module *module )
} }
if ( !module->instanceKey().isValid() ) if ( !module->instanceKey().isValid() )
{ {
cWarning() << "Module" << module->location() << '@' << (void*)module << "has invalid instance key."; cWarning() << "Module" << module->location() << Logger::Pointer(module) << "has invalid instance key.";
return false; return false;
} }
if ( !checkModuleDependencies( *module ) ) if ( !checkModuleDependencies( *module ) )

4
src/modules/partition/core/PartUtils.cpp
View file

@ -459,7 +459,7 @@ isEfiBootable( const Partition* candidate )
while ( root && !root->isRoot() ) while ( root && !root->isRoot() )
{ {
root = root->parent(); root = root->parent();
cDebug() << Logger::SubEntry << "moved towards root" << (void*)root; cDebug() << Logger::SubEntry << "moved towards root" << Logger::Pointer(root);
} }
// Strange case: no root found, no partition table node? // Strange case: no root found, no partition table node?
@ -469,7 +469,7 @@ isEfiBootable( const Partition* candidate )
} }
const PartitionTable* table = dynamic_cast< const PartitionTable* >( root ); const PartitionTable* table = dynamic_cast< const PartitionTable* >( root );
cDebug() << Logger::SubEntry << "partition table" << (void*)table << "type" cDebug() << Logger::SubEntry << "partition table" << Logger::Pointer(table) << "type"
<< ( table ? table->type() : PartitionTable::TableType::unknownTableType ); << ( table ? table->type() : PartitionTable::TableType::unknownTableType );
return table && ( table->type() == PartitionTable::TableType::gpt ) && flags.testFlag( KPM_PARTITION_FLAG( Boot ) ); return table && ( table->type() == PartitionTable::TableType::gpt ) && flags.testFlag( KPM_PARTITION_FLAG( Boot ) );
} }