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

[partition] Use signed sizes

Browse Source
This commit is contained in:
Adriaan de Groot 2022-02-08 16:42:31 +01:00
parent a59c45d869
commit 0be88f1453
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/modules/partition/core/PartUtils.cpp
View File

@ -479,7 +479,7 @@ isEfiFilesystemSuitableSize( const Partition* candidate )
return false; return false;
} }
if ( size_t( size ) >= efiFilesystemMinimumSize() ) if ( size >= efiFilesystemMinimumSize() )
{ {
return true; return true;
} }
@ -524,12 +524,12 @@ isEfiBootable( const Partition* candidate )
} }
// TODO: this is configurable via the config file **already** // TODO: this is configurable via the config file **already**
size_t qint64
efiFilesystemMinimumSize() efiFilesystemMinimumSize()
{ {
using CalamaresUtils::Units::operator""_MiB; using CalamaresUtils::Units::operator""_MiB;
size_t uefisys_part_sizeB = 300_MiB; qint64 uefisys_part_sizeB = 300_MiB;
// The default can be overridden; the key used here comes // The default can be overridden; the key used here comes
// from the partition module Config.cpp // from the partition module Config.cpp
@ -537,7 +537,7 @@ efiFilesystemMinimumSize()
if ( gs->contains( "efiSystemPartitionSize_i" ) ) if ( gs->contains( "efiSystemPartitionSize_i" ) )
{ {
qint64 v = gs->value( "efiSystemPartitionSize_i" ).toLongLong(); qint64 v = gs->value( "efiSystemPartitionSize_i" ).toLongLong();
uefisys_part_sizeB = v > 0 ? static_cast< size_t >( v ) : 0; uefisys_part_sizeB = v > 0 ? v : 0;
} }
// There is a lower limit of what can be configured // There is a lower limit of what can be configured
if ( uefisys_part_sizeB < 32_MiB ) if ( uefisys_part_sizeB < 32_MiB )

2
src/modules/partition/core/PartUtils.h
View File

@ -107,7 +107,7 @@ bool isEfiFilesystemSuitableSize( const Partition* candidate );
* *
* A minimum of 32MiB (which is bonkers-small) is enforced. * A minimum of 32MiB (which is bonkers-small) is enforced.
*/ */
size_t efiFilesystemMinimumSize(); qint64 efiFilesystemMinimumSize();
/** /**
* @brief Is the given @p partition bootable in EFI? Depending on * @brief Is the given @p partition bootable in EFI? Depending on