From: Arvin Schnell <aschnell@suse.de>
Date: Thu, 13 Jan 2011 14:10:02 +0000 (+0100)
Subject: - added snapshotDir
X-Git-Tag: v0.1.3~550
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f29e2bcf58bf3bd52fac07a265bfbfa87b3738be;p=thirdparty%2Fsnapper.git

- added snapshotDir
---

diff --git a/snapper/Snapper.cc b/snapper/Snapper.cc
index dfad274a..bafa3f8f 100644
--- a/snapper/Snapper.cc
+++ b/snapper/Snapper.cc
@@ -73,12 +73,22 @@ namespace snapper
     }
 
 
-    bool operator<(Snapshot a, Snapshot b)
+    bool operator<(const Snapshot& a, const Snapshot& b)
     {
 	return a.num < b.num;
     }
 
 
+    string
+    snapshotDir(const Snapshot& snapshot)
+    {
+	if (snapshot.num == 0)
+	    return "/";
+	else
+	    return SNAPSHOTSDIR "/" + decString(snapshot.num) + "/snapshot";
+    }
+
+
     void
     readSnapshots()
     {
@@ -306,13 +316,10 @@ namespace snapper
     void
     compareBtrfsSnapshots()
     {
-	string dir1 = SNAPSHOTSDIR "/" + decString(snapshot1.num) + "/snapshot";
-	string dir2 = SNAPSHOTSDIR "/" + decString(snapshot2.num) + "/snapshot";
-
 	files.clear();
 	pre_to_post_status.clear();
 
-	cmpDirs(dir1, dir2, log);
+	cmpDirs(snapshotDir(snapshot1), snapshotDir(snapshot2), log);
     }