napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[calamares] Reduce compile warnings in tests

Browse Source 
- Switch debug-level to unsigned
 - Don't shadow usings; the first TR type is enough
 - The (bogus) return values were commented as // NOTREACHED,
   but still yield unreachable code warnings. Drop them
   instead, and rely on the compiler understanding [[noreturn]]
   on parser.usage().
This commit is contained in:
Adriaan de Groot 2019-04-11 12:14:04 +02:00
parent b10c7ad9c6
commit b416842c20
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/calamares/testmain.cpp
View File

@ -80,9 +80,9 @@ handle_args( QCoreApplication& a )
if ( parser.isSet( debugLevelOption ) ) if ( parser.isSet( debugLevelOption ) )
{ {
bool ok = true; bool ok = true;
int l = parser.value( debugLevelOption ).toInt( &ok ); unsigned int l = parser.value( debugLevelOption ).toUInt( &ok );
unsigned int dlevel = 0; unsigned int dlevel = 0;
if ( !ok || ( l < 0 ) ) if ( !ok )
dlevel = Logger::LOGVERBOSE; dlevel = Logger::LOGVERBOSE;
else else
dlevel = l; dlevel = l;
@ -94,20 +94,20 @@ handle_args( QCoreApplication& a )
{ {
cError() << "Missing <module> path.\n"; cError() << "Missing <module> path.\n";
parser.showHelp(); parser.showHelp();
return ModuleConfig(); // NOTREACHED
} }
if ( args.size() > 2 ) else if ( args.size() > 2 )
{ {
cError() << "More than one <module> path.\n"; cError() << "More than one <module> path.\n";
parser.showHelp(); parser.showHelp();
return ModuleConfig(); // NOTREACHED
} }
else
{
QString jobSettings( parser.value( jobOption ) );
if ( jobSettings.isEmpty() && ( args.size() == 2 ) )
jobSettings = args.at(1);
QString jobSettings( parser.value( jobOption ) ); return ModuleConfig{ args.first(), jobSettings, parser.value( globalOption ), parser.value( langOption ) };
if ( jobSettings.isEmpty() && ( args.size() == 2 ) ) }
jobSettings = args.at(1);
return ModuleConfig{ args.first(), jobSettings, parser.value( globalOption ), parser.value( langOption ) };
} }
@ -207,7 +207,7 @@ main( int argc, char* argv[] )
return 1; return 1;
} }
using TR = Logger::DebugRow<const char*, const QString&>; using TR = Logger::DebugRow<const char*, const QString>;
cDebug() << "Module metadata" cDebug() << "Module metadata"
<< TR( "name", m->name() ) << TR( "name", m->name() )
@ -223,7 +223,6 @@ main( int argc, char* argv[] )
Calamares::JobResult r = p->exec(); Calamares::JobResult r = p->exec();
if ( !r ) if ( !r )
{ {
using TR = Logger::DebugRow<QString, QString>;
cDebug() << count << ".. failed" cDebug() << count << ".. failed"
<< TR( "summary", r.message() ) << TR( "summary", r.message() )
<< TR( "details", r.details() ); << TR( "details", r.details() );