Add ScopedRemoveData

Change-Id: I83ca4ea4c72826ebcf53d2f03df94c0e0ce1d2fa

diff --git a/src/ckm/ckm-common.cpp b/src/ckm/ckm-common.cpp
index b0adbc50353c8fd59ac7a4efecacc68af636f97a..9a0f1fe73a16e580512f3d245dd82fba868251f2 100644 (file)
--- a/src/ckm/ckm-common.cpp
+++ b/src/ckm/ckm-common.cpp
@@ -201,12 +201,11 @@ bool PidBound::SamePid() const
     return getpid() == m_pid;
 }
 
-ScopedSaveData::ScopedSaveData(const char* alias, const char *data, int expected_err) : m_alias(alias)
+ScopedRemoveData::ScopedRemoveData(const char* alias) : m_alias(alias)
 {
-    save_data(alias, data, expected_err);
 }
 
-ScopedSaveData::~ScopedSaveData()
+ScopedRemoveData::~ScopedRemoveData()
 {
     if (!SamePid())
         return;
@@ -218,6 +217,12 @@ ScopedSaveData::~ScopedSaveData()
     check_remove_allowed(m_alias.c_str());
 }
 
+ScopedSaveData::ScopedSaveData(const char* alias, const char *data, int expected_err) :
+    ScopedRemoveData(alias)
+{
+    save_data(alias, data, expected_err);
+}
+
 ScopedDBUnlock::ScopedDBUnlock(uid_t user_id, const char* passwd) : m_uid(user_id)
 {
     int temp;

diff --git a/src/ckm/ckm-common.h b/src/ckm/ckm-common.h
index 76b1b2b484320903a2918b0a1681858184cfc85f..a8293b673f9246c9252fa7ed82f9edd23128196e 100644 (file)
--- a/src/ckm/ckm-common.h
+++ b/src/ckm/ckm-common.h
@@ -186,16 +186,21 @@ private:
     pid_t m_pid;
 };
 
-class ScopedSaveData : public PidBound
+class ScopedRemoveData: public PidBound
 {
 public:
-    ScopedSaveData(const char* alias, const char *data, int expected_err = CKMC_ERROR_NONE);
-    ~ScopedSaveData();
-
-private:
+    explicit ScopedRemoveData(const char* alias);
+    virtual ~ScopedRemoveData();
+protected:
     std::string m_alias;
 };
 
+class ScopedSaveData : public ScopedRemoveData
+{
+public:
+    ScopedSaveData(const char* alias, const char *data, int expected_err = CKMC_ERROR_NONE);
+};
+
 class ScopedDBUnlock : public PidBound
 {
 public: