X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fupdate_checker.cc;h=2c2e23be165dfd04b293789a5babc96c5188841d;hb=809bcfd85fad2ef7d4131c054be4cccd5bcc9d05;hp=0fad330fd58ccd1b9942db4c47bf491c9757826a;hpb=e3c7656f9dc0acbaf518c051b847ee2e4eb7ba23;p=dcpomatic.git

diff --git a/src/lib/update_checker.cc b/src/lib/update_checker.cc
index 0fad330fd..2c2e23be1 100644
--- a/src/lib/update_checker.cc
+++ b/src/lib/update_checker.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,6 +18,7 @@
 
 */
 
+
 #include "update_checker.h"
 #include "version.h"
 #include "util.h"
@@ -28,8 +29,10 @@
 #include <string>
 #include <iostream>
 
+
 #define BUFFER_SIZE 1024
 
+
 using std::cout;
 using std::min;
 using std::string;
@@ -38,8 +41,10 @@ using boost::is_any_of;
 using boost::ends_with;
 using dcp::raw_convert;
 
+
 /** Singleton instance */
-UpdateChecker* UpdateChecker::_instance = 0;
+UpdateChecker* UpdateChecker::_instance = nullptr;
+
 
 static size_t
 write_callback_wrapper (void* data, size_t size, size_t nmemb, void* user)
@@ -47,17 +52,13 @@ write_callback_wrapper (void* data, size_t size, size_t nmemb, void* user)
 	return reinterpret_cast<UpdateChecker*>(user)->write_callback (data, size, nmemb);
 }
 
+
 /** Construct an UpdateChecker.  This sets things up and starts a thread to
  *  do the work.
  */
 UpdateChecker::UpdateChecker ()
-	: _buffer (new char[BUFFER_SIZE])
-	, _offset (0)
-	, _curl (0)
-	, _state (NOT_RUN)
-	, _emits (0)
-	, _to_do (0)
-	, _terminate (false)
+	: _buffer (BUFFER_SIZE)
+	, _state (State::NOT_RUN)
 {
 	_curl = curl_easy_init ();
 
@@ -70,6 +71,7 @@ UpdateChecker::UpdateChecker ()
 	curl_easy_setopt (_curl, CURLOPT_USERAGENT, agent.c_str ());
 }
 
+
 void
 UpdateChecker::start ()
 {
@@ -79,6 +81,7 @@ UpdateChecker::start ()
 #endif
 }
 
+
 UpdateChecker::~UpdateChecker ()
 {
 	boost::this_thread::disable_interruption dis;
@@ -94,9 +97,9 @@ UpdateChecker::~UpdateChecker ()
 	} catch (...) {}
 
 	curl_easy_cleanup (_curl);
-	delete[] _buffer;
 }
 
+
 /** Start running the update check */
 void
 UpdateChecker::run ()
@@ -106,6 +109,7 @@ UpdateChecker::run ()
 	_condition.notify_one ();
 }
 
+
 void
 UpdateChecker::thread ()
 {
@@ -130,14 +134,14 @@ UpdateChecker::thread ()
 
 			int r = curl_easy_perform (_curl);
 			if (r != CURLE_OK) {
-				set_state (FAILED);
-				return;
+				set_state (State::FAILED);
+				continue;
 			}
 
 			/* Parse the reply */
 
 			_buffer[_offset] = '\0';
-			string s (_buffer);
+			string s (_buffer.data());
 			cxml::Document doc ("Update");
 			doc.read_string (s);
 
@@ -161,37 +165,39 @@ UpdateChecker::thread ()
 			}
 
 			if (_stable || _test) {
-				set_state (YES);
+				set_state (State::YES);
 			} else {
-				set_state (NO);
+				set_state (State::NO);
 			}
 		} catch (...) {
-			set_state (FAILED);
+			set_state (State::FAILED);
 		}
 	}
 }
 
+
 size_t
 UpdateChecker::write_callback (void* data, size_t size, size_t nmemb)
 {
 	size_t const t = min (size * nmemb, size_t (BUFFER_SIZE - _offset - 1));
-	memcpy (_buffer + _offset, data, t);
+	memcpy (_buffer.data() + _offset, data, t);
 	_offset += t;
 	return t;
 }
 
+
 void
 UpdateChecker::set_state (State s)
 {
 	{
 		boost::mutex::scoped_lock lm (_data_mutex);
 		_state = s;
-		_emits++;
 	}
 
-	emit (boost::bind (boost::ref (StateChanged)));
+	emit (boost::bind(boost::ref(StateChanged)));
 }
 
+
 UpdateChecker *
 UpdateChecker::instance ()
 {
@@ -203,6 +209,7 @@ UpdateChecker::instance ()
 	return _instance;
 }
 
+
 bool
 UpdateChecker::version_less_than (string const & a, string const & b)
 {
@@ -214,24 +221,24 @@ UpdateChecker::version_less_than (string const & a, string const & b)
 	DCPOMATIC_ASSERT (ap.size() == 3 && bp.size() == 3);
 
 	if (ap[0] != bp[0]) {
-		return raw_convert<int> (ap[0]) < raw_convert<int> (bp[0]);
+		return raw_convert<int>(ap[0]) < raw_convert<int>(bp[0]);
 	}
 
 	if (ap[1] != bp[1]) {
-		return raw_convert<int> (ap[1]) < raw_convert<int> (bp[1]);
+		return raw_convert<int>(ap[1]) < raw_convert<int>(bp[1]);
 	}
 	float am;
 	if (ends_with (ap[2], "devel")) {
-		am = raw_convert<int> (ap[2].substr (0, ap[2].length() - 5)) + 0.5;
+		am = raw_convert<int>(ap[2].substr(0, ap[2].length() - 5)) + 0.5;
 	} else {
-		am = raw_convert<int> (ap[2]);
+		am = raw_convert<int>(ap[2]);
 	}
 
 	float bm;
 	if (ends_with (bp[2], "devel")) {
-		bm = raw_convert<int> (bp[2].substr (0, bp[2].length() - 5)) + 0.5;
+		bm = raw_convert<int>(bp[2].substr(0, bp[2].length() - 5)) + 0.5;
 	} else {
-		bm = raw_convert<int> (bp[2]);
+		bm = raw_convert<int>(bp[2]);
 	}
 
 	return am < bm;