[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kpmcore] src/fs: Mark luks sector size to be constexpr.
From:       Andrius_Å tikonas <andrius () stikonas ! eu>
Date:       2016-09-12 18:44:20
Message-ID: E1bjWDM-0003l4-CX () code ! kde ! org
[Download RAW message or body]

Git commit 5592c05ef30f55773b8cff53bcb9fc9884a414c7 by Andrius Å tikonas.
Committed on 12/09/2016 at 18:43.
Pushed by stikonas into branch 'master'.

Mark luks sector size to be constexpr.

M  +1    -2    src/fs/luks.cpp
M  +1    -5    src/fs/luks.h

http://commits.kde.org/kpmcore/5592c05ef30f55773b8cff53bcb9fc9884a414c7

diff --git a/src/fs/luks.cpp b/src/fs/luks.cpp
index c244296..a408ccf 100644
--- a/src/fs/luks.cpp
+++ b/src/fs/luks.cpp
@@ -61,7 +61,6 @@ luks::luks(qint64 firstsector,
     , m_isCryptOpen(false)
     , m_cryptsetupFound(m_Create != cmdSupportNone)
     , m_isMounted(false)
-    , m_logicalSectorSize(512)
 {
 }
 
@@ -486,7 +485,7 @@ bool luks::resize(Report& report, const QString& deviceNode, \
qint64 newLength) c  else if (m_innerFs->resize(report, mapperName(), payloadLength))
     {
         ExternalCommand cryptResizeCmd(report, QStringLiteral("cryptsetup"),
-                {  QStringLiteral("--size"), QString::number(payloadLength / \
/*m_logicalSectorSize*/ 512), // LUKS assume 512 bytes sector +                {  \
QStringLiteral("--size"), QString::number(payloadLength / m_logicalSectorSize), // \
LUKS assumes 512 bytes sector  QStringLiteral("resize"), mapperName() });
         report.line() << xi18nc("@info:progress", "Resizing LUKS crypt on partition \
<filename>%1</filename>.", deviceNode);  if (cryptResizeCmd.run(-1) && \
                cryptResizeCmd.exitCode() == 0)
diff --git a/src/fs/luks.h b/src/fs/luks.h
index 3c65ec3..918d38c 100644
--- a/src/fs/luks.h
+++ b/src/fs/luks.h
@@ -105,10 +105,6 @@ public:
         return m_GetUUID;
     }
 
-    void setLogicalSectorSize(unsigned int logicalSectorSize) {
-        m_logicalSectorSize = logicalSectorSize;
-    }
-
     bool check(Report& report, const QString& deviceNode) const override;
     bool create(Report& report, const QString& deviceNode) override;
     SupportTool supportToolName() const override;
@@ -189,7 +185,7 @@ private:
     mutable bool m_cryptsetupFound;
     QString m_passphrase;
     bool m_isMounted;
-    unsigned int m_logicalSectorSize;
+    constexpr static unsigned int m_logicalSectorSize = 512;
 
     QString m_MapperName;
     QString m_CipherName;


[prev in list] [next in list] [prev in thread] [next in thread]