Merge pull request #913 from aschnell/master

- coding style (sync with libstorage-ng)
openSUSE · Jun 7, 2024 · f34323d · f34323d
2 parents 5673ae2 + d3b568a
commit f34323d
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/snapper/AppUtil.cc b/snapper/AppUtil.cc
@@ -411,14 +411,14 @@ namespace snapper
     }
 
 
-    StopWatch::StopWatch()
+    Stopwatch::Stopwatch()
 	: start_time(chrono::steady_clock::now())
     {
     }
 
 
     double
-    StopWatch::read() const
+    Stopwatch::read() const
     {
 	chrono::steady_clock::time_point stop_time = chrono::steady_clock::now();
 	chrono::steady_clock::duration duration = stop_time - start_time;
@@ -427,10 +427,10 @@ namespace snapper
 
 
     std::ostream&
-    operator<<(std::ostream& s, const StopWatch& sw)
+    operator<<(std::ostream& s, const Stopwatch& stopwatch)
     {
 	boost::io::ios_all_saver ias(s);
-	return s << fixed << sw.read() << "s";
+	return s << fixed << stopwatch.read() << "s";
     }
 
 

diff --git a/snapper/AppUtil.h b/snapper/AppUtil.h
@@ -119,15 +119,15 @@ namespace snapper
     vector<gid_t> getgrouplist(const char* username, gid_t gid);
 
 
-    class StopWatch
+    class Stopwatch
     {
     public:
 
-	StopWatch();
+	Stopwatch();
 
 	double read() const;
 
-	friend std::ostream& operator<<(std::ostream& s, const StopWatch& sw);
+	friend std::ostream& operator<<(std::ostream& s, const Stopwatch& sopwatch);
 
     protected:
 

diff --git a/snapper/Btrfs.cc b/snapper/Btrfs.cc
@@ -1361,7 +1361,7 @@ namespace snapper
 
 	try
 	{
-	    StopWatch stopwatch;
+	    Stopwatch stopwatch;
 
 	    const SDir subvolume(openSubvolumeDir());
 

diff --git a/snapper/Compare.cc b/snapper/Compare.cc
@@ -450,7 +450,7 @@ namespace snapper
 
 	y2mil("dev1:" << cmp_data.dev1 << " dev2:" << cmp_data.dev2);
 
-	StopWatch stopwatch;
+	Stopwatch stopwatch;
 	cmpDirsWorker(cmp_data, dir1, dir2, "");
 	y2mil("stopwatch " << stopwatch << " for comparing directories");
     }

diff --git a/snapper/SystemCmd.cc b/snapper/SystemCmd.cc
@@ -81,7 +81,7 @@ SystemCmd::~SystemCmd()
     void
     SystemCmd::execute()
     {
-    StopWatch stopwatch;
+    Stopwatch stopwatch;
 
     File_aC[IDX_STDERR] = File_aC[IDX_STDOUT] = NULL;
     invalidate();

diff --git a/testsuite-cmp/cmp.cc b/testsuite-cmp/cmp.cc
@@ -36,7 +36,7 @@ cmp(const string& fstype, const string& subvolume, unsigned int num1, unsigned i
     double t1;
 
     {
-	StopWatch sw1;
+	Stopwatch sw1;
 
 #if 1
 	cmpdirs_cb_t cb1 = helper(result1);
@@ -58,7 +58,7 @@ cmp(const string& fstype, const string& subvolume, unsigned int num1, unsigned i
     double t2;
 
     {
-	StopWatch sw2;
+	Stopwatch sw2;
 
 #if 1
 	cmpdirs_cb_t cb2 = helper(result2);