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

List:       kde-commits
Subject:    [kpmcore] src: Make initLUKS function non-static.
From:       Andrius_Å tikonas <andrius () stikonas ! eu>
Date:       2016-11-30 17:18:57
Message-ID: E1cC8X3-0002dg-8s () code ! kde ! org
[Download RAW message or body]

Git commit 2e960d5c0026bcd6870b8e6c3d38255e24e1ca15 by Andrius Å tikonas.
Committed on 30/11/2016 at 17:18.
Pushed by stikonas into branch 'master'.

Make initLUKS function non-static.

M  +4    -2    src/core/lvmdevice.cpp
M  +8    -11   src/fs/luks.cpp
M  +1    -1    src/fs/luks.h
M  +3    -2    src/plugins/libparted/libpartedbackend.cpp

https://commits.kde.org/kpmcore/2e960d5c0026bcd6870b8e6c3d38255e24e1ca15

diff --git a/src/core/lvmdevice.cpp b/src/core/lvmdevice.cpp
index 377594d..861363c 100644
--- a/src/core/lvmdevice.cpp
+++ b/src/core/lvmdevice.cpp
@@ -131,8 +131,10 @@ Partition* LvmDevice::scanPartition(const QString& lvPath, PartitionTable* pTabl
     // Handle LUKS partition
     if (fs->type() == FileSystem::Luks) {
         r |= PartitionRole::Luks;
-        FS::luks::initLUKS(fs);
-        QString mapperNode = static_cast<FS::luks*>(fs)->mapperName();
+        FS::luks* luksFs = static_cast<FS::luks*>(fs);
+        luksFs->initLUKS();
+
+        QString mapperNode = luksFs->mapperName();
         mountPoint = FileSystem::detectMountPoint(fs, mapperNode);
         mounted    = FileSystem::detectMountStatus(fs, mapperNode);
     } else {
diff --git a/src/fs/luks.cpp b/src/fs/luks.cpp
index a11d75d..95b6afe 100644
--- a/src/fs/luks.cpp
+++ b/src/fs/luks.cpp
@@ -642,17 +642,14 @@ bool luks::canEncryptType(FileSystem::Type type)
     }
 }
 
-void luks::initLUKS(FileSystem* fs)
-{
-    if (fs->type() == FileSystem::Luks) {
-        FS::luks* luksFS = static_cast<FS::luks*>(fs);
-        QString mapperNode = luksFS->mapperName();
-        bool isCryptOpen = !mapperNode.isEmpty();
-        luksFS->setCryptOpen(isCryptOpen);
-        if (isCryptOpen) {
-            luksFS->loadInnerFileSystem(mapperNode);
-            luksFS->setMounted(detectMountStatus(luksFS->innerFS(), mapperNode));
-        }
+void luks::initLUKS()
+{
+    QString mapperNode = mapperName();
+    bool isCryptOpen = !mapperNode.isEmpty();
+    setCryptOpen(isCryptOpen);
+    if (isCryptOpen) {
+        loadInnerFileSystem(mapperNode);
+        setMounted(detectMountStatus(innerFS(), mapperNode));
     }
 }
 
diff --git a/src/fs/luks.h b/src/fs/luks.h
index 41d1ac4..e481829 100644
--- a/src/fs/luks.h
+++ b/src/fs/luks.h
@@ -181,7 +181,7 @@ public:
     qint64 payloadOffset() const { return m_PayloadOffset; }
 
     static bool canEncryptType(FileSystem::Type type);
-    static void initLUKS(FileSystem* fs);
+    void initLUKS();
 
 protected:
     virtual QString readOuterUUID(const QString& deviceNode) const;
diff --git a/src/plugins/libparted/libpartedbackend.cpp b/src/plugins/libparted/libpartedbackend.cpp
index dc5262a..abc622b 100644
--- a/src/plugins/libparted/libpartedbackend.cpp
+++ b/src/plugins/libparted/libpartedbackend.cpp
@@ -340,8 +340,9 @@ void LibPartedBackend::scanDevicePartitions(Device& d, PedDisk* pedDisk)
         // libparted does not handle LUKS partitions
         if (fs->type() == FileSystem::Luks) {
             r |= PartitionRole::Luks;
-            FS::luks::initLUKS(fs);
-            QString mapperNode = static_cast<FS::luks*>(fs)->mapperName();
+            FS::luks* luksFs = static_cast<FS::luks*>(fs);
+            luksFs->initLUKS();
+            QString mapperNode = luksFs->mapperName();
             mountPoint = FileSystem::detectMountPoint(fs, mapperNode);
             mounted    = FileSystem::detectMountStatus(fs, mapperNode);
         } else {
[prev in list] [next in list] [prev in thread] [next in thread]