From 449fba03bef955bdd8b4bb09cede8a9b60274e75 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Thu, 9 Nov 2023 22:17:51 +0100
Subject: [PATCH] [partition] Factor out GS keys for EFI-size sharing

---
 src/modules/partition/core/PartUtils.cpp | 16 ++++++++++++++--
 src/modules/partition/core/PartUtils.h   |  6 ++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/modules/partition/core/PartUtils.cpp b/src/modules/partition/core/PartUtils.cpp
index ac13b2896..bc3e6f5a0 100644
--- a/src/modules/partition/core/PartUtils.cpp
+++ b/src/modules/partition/core/PartUtils.cpp
@@ -530,10 +530,16 @@ isEfiBootable( const Partition* candidate )
     return flags.testFlag( KPM_PARTITION_FLAG_ESP );
 }
 
+QString
+efiFilesystemRecommendedSizeGSKey()
+{
+    return QStringLiteral( "efiSystemPartitionSize_i" );
+}
+
 qint64
 efiFilesystemRecommendedSize()
 {
-    const QString key = QStringLiteral( "efiSystemPartitionSize_i" );
+    const QString key = efiFilesystemRecommendedSizeGSKey();
 
     qint64 uefisys_part_sizeB = 300_MiB;
 
@@ -553,10 +559,16 @@ efiFilesystemRecommendedSize()
     return uefisys_part_sizeB;
 }
 
+QString
+efiFilesystemMinimumSizeGSKey()
+{
+    return QStringLiteral( "efiSystemPartitionMinimumSize_i" );
+}
+
 qint64
 efiFilesystemMinimumSize()
 {
-    const QString key = QStringLiteral( "efiSystemPartitionMinimumSize_i" );
+    const QString key = efiFilesystemMinimumSizeGSKey();
 
     qint64 uefisys_part_sizeB = efiFilesystemRecommendedSize();
 
diff --git a/src/modules/partition/core/PartUtils.h b/src/modules/partition/core/PartUtils.h
index e1cca794f..7813a98c4 100644
--- a/src/modules/partition/core/PartUtils.h
+++ b/src/modules/partition/core/PartUtils.h
@@ -120,12 +120,18 @@ bool isEfiFilesystemMinimumSize( const Partition* candidate );
  */
 qint64 efiFilesystemRecommendedSize();
 
+// Helper for consistency: the GS key used to share the recommended size
+QString efiFilesystemRecommendedSizeGSKey();
+
 /** @brief Returns the hard-minimum size of an EFI boot partition in bytes.
  *
  * This is 32MiB, based on the FAT32 standard and EFI documentation.
  */
 qint64 efiFilesystemMinimumSize();
 
+// Helper for consistency: the GS key used to share the minimum size
+QString efiFilesystemMinimumSizeGSKey();
+
 /**
  * @brief Is the given @p partition bootable in EFI? Depending on
  * the partition table layout, this may mean different flags.